diff options
author | Asias He <asias@redhat.com> | 2013-07-25 05:39:34 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-07-28 01:14:06 -0400 |
commit | 82a54d0ebbee03a8dcf4e1e4016a53fed4d6c933 (patch) | |
tree | 6ffaeb247c68620fe550fd717e9beb6d00b3b896 | |
parent | a648ab58f28ceb158a5fca34ec876dbe5a0d97bf (diff) |
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 @@ | |||
96 | #include <linux/wait.h> | 96 | #include <linux/wait.h> |
97 | #include <linux/workqueue.h> | 97 | #include <linux/workqueue.h> |
98 | #include <net/sock.h> | 98 | #include <net/sock.h> |
99 | 99 | #include <net/af_vsock.h> | |
100 | #include "af_vsock.h" | ||
101 | 100 | ||
102 | static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr); | 101 | static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr); |
103 | static void vsock_sk_destruct(struct sock *sk); | 102 | 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 @@ | |||
34 | #include <linux/wait.h> | 34 | #include <linux/wait.h> |
35 | #include <linux/workqueue.h> | 35 | #include <linux/workqueue.h> |
36 | #include <net/sock.h> | 36 | #include <net/sock.h> |
37 | #include <net/af_vsock.h> | ||
37 | 38 | ||
38 | #include "af_vsock.h" | ||
39 | #include "vmci_transport_notify.h" | 39 | #include "vmci_transport_notify.h" |
40 | 40 | ||
41 | static int vmci_transport_recv_dgram_cb(void *data, struct vmci_datagram *dg); | 41 | 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 @@ | |||
19 | #include <linux/vmw_vmci_defs.h> | 19 | #include <linux/vmw_vmci_defs.h> |
20 | #include <linux/vmw_vmci_api.h> | 20 | #include <linux/vmw_vmci_api.h> |
21 | 21 | ||
22 | #include "vsock_addr.h" | 22 | #include <net/vsock_addr.h> |
23 | #include "af_vsock.h" | 23 | #include <net/af_vsock.h> |
24 | 24 | ||
25 | /* If the packet format changes in a release then this should change too. */ | 25 | /* If the packet format changes in a release then this should change too. */ |
26 | #define VMCI_TRANSPORT_PACKET_VERSION 1 | 26 | #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 @@ | |||
17 | #include <linux/socket.h> | 17 | #include <linux/socket.h> |
18 | #include <linux/stddef.h> | 18 | #include <linux/stddef.h> |
19 | #include <net/sock.h> | 19 | #include <net/sock.h> |
20 | 20 | #include <net/vsock_addr.h> | |
21 | #include "vsock_addr.h" | ||
22 | 21 | ||
23 | void vsock_addr_init(struct sockaddr_vm *addr, u32 cid, u32 port) | 22 | void vsock_addr_init(struct sockaddr_vm *addr, u32 cid, u32 port) |
24 | { | 23 | { |