diff --git a/net/vmw_vsock/af_vsock.h b/include/net/af_vsock.h similarity index 100% rename from net/vmw_vsock/af_vsock.h rename to include/net/af_vsock.h diff --git a/net/vmw_vsock/vsock_addr.h b/include/net/vsock_addr.h similarity index 100% rename from net/vmw_vsock/vsock_addr.h rename to include/net/vsock_addr.h diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 593071dabd1cc7477169b24bc31979d8590465b6..57896eee1c254b2ffb6b46aa35f5ace714a1d15c 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -96,8 +96,7 @@ #include #include #include - -#include "af_vsock.h" +#include 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 ffc11df02af22cf90c03df730110ea2a96f033cb..9d6986634e0bfaf1a4431cc8f6fc015f212e7042 100644 --- a/net/vmw_vsock/vmci_transport.c +++ b/net/vmw_vsock/vmci_transport.c @@ -34,8 +34,8 @@ #include #include #include +#include -#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 fd88ea8924e4dd89d8f0dc7939e5ccc75e39a747..ce6c9623d5f069029ce58294bcc7de9bc3728fcd 100644 --- a/net/vmw_vsock/vmci_transport.h +++ b/net/vmw_vsock/vmci_transport.h @@ -19,8 +19,8 @@ #include #include -#include "vsock_addr.h" -#include "af_vsock.h" +#include +#include /* 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 ec2611b4ea0ee4fc073926c9a33347ace8de9e4f..82486ee55eaca4cc4f4b1cb414cc848c1239ec46 100644 --- a/net/vmw_vsock/vsock_addr.c +++ b/net/vmw_vsock/vsock_addr.c @@ -17,8 +17,7 @@ #include #include #include - -#include "vsock_addr.h" +#include void vsock_addr_init(struct sockaddr_vm *addr, u32 cid, u32 port) {