diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-29 09:58:53 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-29 09:58:53 +0300 |
| commit | 53c1cf42817899f88114c28c6bbe4fe0f3c8afb6 (patch) | |
| tree | 57bff7c4bb6e14af2e98d4f4b170abf06cf95415 /include/linux/virtio_vsock.h | |
| parent | 896d81fefe5d1919537db2c2150ab6384e4a6610 (diff) | |
| parent | c02ed2e75ef4c74e41e421acb4ef1494671585e8 (diff) | |
| download | linux-53c1cf42817899f88114c28c6bbe4fe0f3c8afb6.tar.xz | |
Merge 4.11-rc4 into tty-next
We want the tty/serial fixes in here to handle bugfixes and merge
issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/virtio_vsock.h')
| -rw-r--r-- | include/linux/virtio_vsock.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h index 9638bfeb0d1f..584f9a647ad4 100644 --- a/include/linux/virtio_vsock.h +++ b/include/linux/virtio_vsock.h @@ -48,6 +48,8 @@ struct virtio_vsock_pkt { struct virtio_vsock_hdr hdr; struct work_struct work; struct list_head list; + /* socket refcnt not held, only use for cancellation */ + struct vsock_sock *vsk; void *buf; u32 len; u32 off; @@ -56,6 +58,7 @@ struct virtio_vsock_pkt { struct virtio_vsock_pkt_info { u32 remote_cid, remote_port; + struct vsock_sock *vsk; struct msghdr *msg; u32 pkt_len; u16 type; |