diff options
| author | Asias He <asias@redhat.com> | 2016-07-28 15:36:32 +0100 |
|---|---|---|
| committer | Alistair Strachan <astrachan@google.com> | 2019-01-15 17:08:35 -0800 |
| commit | d5590af888cb5de3e30ea96dd35f07393fd5ab84 (patch) | |
| tree | 66440ce0afb5dd39ebe4c8aff4bf07f5cac5fd9f /include/net | |
| parent | 716adf173f7fae9319fc6f30325fe2264ec2cfcd (diff) | |
BACKPORT: VSOCK: Introduce virtio_vsock_common.ko
This module contains the common code and header files for the following
virtio_transporto and vhost_vsock kernel modules.
Signed-off-by: Asias He <asias@redhat.com>
Signed-off-by: Claudio Imbrenda <imbrenda@linux.vnet.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 06a8fc78367d070720af960dcecec917d3ae5f3b)
[astrachan: Backported around stable backport 62209d1 ("vsock: split
dwork to avoid reinitializations")]
Bug: 121166534
Test: Ran cuttlefish with android-4.4 + VSOCKETS, VMWARE_VMCI_VSOCKETS
Signed-off-by: Cody Schuffelen <schuffelen@google.com>
Change-Id: I723c073db804663ad4bf83b657c72b16cbdb220a
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/af_vsock.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h index d8a1a41d5f8f..e6675f79b925 100644 --- a/include/net/af_vsock.h +++ b/include/net/af_vsock.h @@ -64,6 +64,8 @@ struct vsock_sock { bool rejected; struct delayed_work connect_work; struct delayed_work pending_work; + struct delayed_work close_work; + bool close_work_scheduled; u32 peer_shutdown; bool sent_request; bool ignore_connecting_rst; |