diff options
| author | Asias He <asias@redhat.com> | 2013-07-25 13:39:34 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-07-28 09:14:06 +0400 |
| commit | 82a54d0ebbee03a8dcf4e1e4016a53fed4d6c933 (patch) | |
| tree | 6ffaeb247c68620fe550fd717e9beb6d00b3b896 | |
| parent | a648ab58f28ceb158a5fca34ec876dbe5a0d97bf (diff) | |
| download | linux-82a54d0ebbee03a8dcf4e1e4016a53fed4d6c933.tar.xz | |
VSOCK: Move af_vsock.h and vsock_addr.h to include/net
This is useful for other VSOCK transport implemented outside the
net/vmw_vsock/ directory to use these headers.
Signed-off-by: Asias He <asias@redhat.com>
Acked-by: Andy King <acking@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/af_vsock.h (renamed from net/vmw_vsock/af_vsock.h) | 0 | ||||
| -rw-r--r-- | include/net/vsock_addr.h (renamed from net/vmw_vsock/vsock_addr.h) | 0 | ||||
| -rw-r--r-- | net/vmw_vsock/af_vsock.c | 3 | ||||
| -rw-r--r-- | net/vmw_vsock/vmci_transport.c | 2 | ||||
| -rw-r--r-- | net/vmw_vsock/vmci_transport.h | 4 | ||||
| -rw-r--r-- | net/vmw_vsock/vsock_addr.c | 3 |
6 files changed, 5 insertions, 7 deletions
diff --git a/net/vmw_vsock/af_vsock.h b/include/net/af_vsock.h index 7d64d3609ec9..7d64d3609ec9 100644 --- a/net/vmw_vsock/af_vsock.h +++ b/include/net/af_vsock.h diff --git a/net/vmw_vsock/vsock_addr.h b/include/net/vsock_addr.h index 9ccd5316eac0..9ccd5316eac0 100644 --- a/net/vmw_vsock/vsock_addr.h +++ b/include/net/vsock_addr.h diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 593071dabd1c..57896eee1c25 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -96,8 +96,7 @@ #include <linux/wait.h> #include <linux/workqueue.h> #include <net/sock.h> - -#include "af_vsock.h" +#include <net/af_vsock.h> static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr); static void vsock_sk_destruct(struct sock *sk); diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index ffc11df02af2..9d6986634e0b 100644 --- a/net/vmw_vsock/vmci_transport.c +++ b/net/vmw_vsock/vmci_transport.c @@ -34,8 +34,8 @@ #include <linux/wait.h> #include <linux/workqueue.h> #include <net/sock.h> +#include <net/af_vsock.h> -#include "af_vsock.h" #include "vmci_transport_notify.h" static int vmci_transport_recv_dgram_cb(void *data, struct vmci_datagram *dg); diff --git a/net/vmw_vsock/vmci_transport.h b/net/vmw_vsock/vmci_transport.h index fd88ea8924e4..ce6c9623d5f0 100644 --- a/net/vmw_vsock/vmci_transport.h +++ b/net/vmw_vsock/vmci_transport.h @@ -19,8 +19,8 @@ #include <linux/vmw_vmci_defs.h> #include <linux/vmw_vmci_api.h> -#include "vsock_addr.h" -#include "af_vsock.h" +#include <net/vsock_addr.h> +#include <net/af_vsock.h> /* If the packet format changes in a release then this should change too. */ #define VMCI_TRANSPORT_PACKET_VERSION 1 diff --git a/net/vmw_vsock/vsock_addr.c b/net/vmw_vsock/vsock_addr.c index ec2611b4ea0e..82486ee55eac 100644 --- a/net/vmw_vsock/vsock_addr.c +++ b/net/vmw_vsock/vsock_addr.c @@ -17,8 +17,7 @@ #include <linux/socket.h> #include <linux/stddef.h> #include <net/sock.h> - -#include "vsock_addr.h" +#include <net/vsock_addr.h> void vsock_addr_init(struct sockaddr_vm *addr, u32 cid, u32 port) { |