sock_diag: Arrange sock_diag.h such that it is exportable to userspace
authorPavel Emelyanov <xemul@parallels.com>
Fri, 30 Dec 2011 00:52:21 +0000 (00:52 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 30 Dec 2011 21:42:18 +0000 (16:42 -0500)
Properly toss existing components around the ifdef __KERNEL__
and include the header into the header-y target.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/Kbuild
include/linux/sock_diag.h

index 0b091b32267da47cb540280223f91f19e0d9d76c..8e484d660bc3c0c23f9afc68928eaf9f8c2d6d41 100644 (file)
@@ -195,6 +195,7 @@ header-y += igmp.h
 header-y += in.h
 header-y += in6.h
 header-y += in_route.h
+header-y += sock_diag.h
 header-y += inet_diag.h
 header-y += inotify.h
 header-y += input.h
index 379d5dccf8e1c6af8a2d65411a7739a747c0587c..66bc18ef4fa434a9a39e47d4f12644dee3912ad6 100644 (file)
@@ -1,16 +1,19 @@
 #ifndef __SOCK_DIAG_H__
 #define __SOCK_DIAG_H__
 
-#define SOCK_DIAG_BY_FAMILY 20
+#include <linux/types.h>
 
-struct sk_buff;
-struct nlmsghdr;
+#define SOCK_DIAG_BY_FAMILY 20
 
 struct sock_diag_req {
        __u8    sdiag_family;
        __u8    sdiag_protocol;
 };
 
+#ifdef __KERNEL__
+struct sk_buff;
+struct nlmsghdr;
+
 struct sock_diag_handler {
        __u8 family;
        int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
@@ -26,4 +29,5 @@ int sock_diag_check_cookie(void *sk, __u32 *cookie);
 void sock_diag_save_cookie(void *sk, __u32 *cookie);
 
 extern struct sock *sock_diag_nlsk;
+#endif /* KERNEL */
 #endif