diff options
| author |   Stefan Hajnoczi <stefanha@redhat.com> | 2015-12-09 10:51:12 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-12-08 21:55:49 -0500 |
| commit | 8ac2837c89c8c0fcad557e4380aeef80580390f9 (patch) | |
| tree | 9fc34a91680351c4bb706a663516b7e79c44978d /include/net/af_vsock.h | |
| parent | Merge branch 'sh_eth-optimize-mdio' (diff) | |
| download | linux-dev-8ac2837c89c8c0fcad557e4380aeef80580390f9.tar.xz linux-dev-8ac2837c89c8c0fcad557e4380aeef80580390f9.zip | |
Revert "Merge branch 'vsock-virtio'"
This reverts commit 0d76d6e8b2507983a2cae4c09880798079007421 and merge
commit c402293bd76fbc93e52ef8c0947ab81eea3ae019, reversing changes made
to c89359a42e2a49656451569c382eed63e781153c.
The virtio-vsock device specification is not finalized yet. Michael
Tsirkin voiced concerned about merging this code when the hardware
interface (and possibly the userspace interface) could still change.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/af_vsock.h')
| -rw-r--r-- | include/net/af_vsock.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h index a0c8fa2ababf..e9eb2d6791b3 100644 --- a/include/net/af_vsock.h +++ b/include/net/af_vsock.h @@ -175,10 +175,8 @@ void vsock_insert_connected(struct vsock_sock *vsk); void vsock_remove_bound(struct vsock_sock *vsk); void vsock_remove_connected(struct vsock_sock *vsk); struct sock *vsock_find_bound_socket(struct sockaddr_vm *addr); -struct sock *vsock_find_unbound_socket(struct sockaddr_vm *addr); struct sock *vsock_find_connected_socket(struct sockaddr_vm *src, struct sockaddr_vm *dst); void vsock_for_each_connected_socket(void (*fn)(struct sock *sk)); -int vsock_bind_dgram_generic(struct vsock_sock *vsk, struct sockaddr_vm *addr); #endif /* __AF_VSOCK_H__ */ |