From e25b909cb7ac68e49d24ee9d88d910a62d7e47f3 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@parallels.com>
Date: Fri, 30 Dec 2011 00:52:21 +0000
Subject: [PATCH] --- yaml --- r: 279141 b: refs/heads/master c:
 e6fe2371bdd3713d0b227e9cd7f905e127ff81a0 h: refs/heads/master i:   279139:
 3b67905f5b4d552f2f66e993dfa761f733e2e97a v: v3

---
 [refs]                          |  2 +-
 trunk/include/linux/Kbuild      |  1 +
 trunk/include/linux/sock_diag.h | 10 +++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0807ede68c54..012db55f3d75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56be178875cf699a17cc285171492353620ef0ae
+refs/heads/master: e6fe2371bdd3713d0b227e9cd7f905e127ff81a0
diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild
index 0b091b32267d..8e484d660bc3 100644
--- a/trunk/include/linux/Kbuild
+++ b/trunk/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/trunk/include/linux/sock_diag.h b/trunk/include/linux/sock_diag.h
index 379d5dccf8e1..66bc18ef4fa4 100644
--- a/trunk/include/linux/sock_diag.h
+++ b/trunk/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