aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@parallels.com>2011-12-30 00:52:21 +0000
committerDavid S. Miller <davem@davemloft.net>2011-12-30 16:42:18 -0500
commite6fe2371bdd3713d0b227e9cd7f905e127ff81a0 (patch)
tree504c0ee7fabcffc6b53ad7ea33e161189252444f /include
parentMerge branch 'tipc-Dec29-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux (diff)
downloadlinux-dev-e6fe2371bdd3713d0b227e9cd7f905e127ff81a0.tar.xz
linux-dev-e6fe2371bdd3713d0b227e9cd7f905e127ff81a0.zip
sock_diag: Arrange sock_diag.h such that it is exportable to userspace
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>
Diffstat (limited to 'include')
-rw-r--r--include/linux/Kbuild1
-rw-r--r--include/linux/sock_diag.h10
2 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 0b091b32267d..8e484d660bc3 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -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
diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
index 379d5dccf8e1..66bc18ef4fa4 100644
--- a/include/linux/sock_diag.h
+++ b/include/linux/sock_diag.h
@@ -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