Patchwork [1/7] sock_diag: Arrange sock_diag.h such that it is exportable to userspace

login
register
mail settings
Submitter Pavel Emelyanov
Date Dec. 30, 2011, 10:52 a.m.
Message ID <4EFD97E5.6080701@parallels.com>
Download mbox | patch
Permalink /patch/133629/
State Accepted
Delegated to: David Miller
Headers show

Comments

Pavel Emelyanov - Dec. 30, 2011, 10:52 a.m.
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>

---
 include/linux/Kbuild      |    1 +
 include/linux/sock_diag.h |   10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
David Miller - Dec. 30, 2011, 9:46 p.m.
From: Pavel Emelyanov <xemul@parallels.com>
Date: Fri, 30 Dec 2011 14:52:21 +0400

> 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>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 0b091b3..8e484d6 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 379d5dc..66bc18e 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