You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
81 lines
2.1 KiB
Diff
81 lines
2.1 KiB
Diff
commit c8942f1f0a7e2160ebf2e51ba89e50ee5895a1e7
|
|
Author: Patrick McHardy <kaber@trash.net>
|
|
Date: Wed May 21 14:08:38 2008 -0700
|
|
|
|
netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__
|
|
|
|
Greg Steuck <greg@nest.cx> points out that some of the netfilter
|
|
headers can't be used in userspace without including linux/types.h
|
|
first. The headers include their own linux/types.h include statements,
|
|
these are stripped by make headers-install because they are inside
|
|
#ifdef __KERNEL__ however. Move them out to fix this.
|
|
|
|
Reported and Tested by Greg Steuck.
|
|
|
|
Signed-off-by: Patrick McHardy <kaber@trash.net>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
|
--- a/include/linux/netfilter.h
|
|
+++ b/include/linux/netfilter.h
|
|
@@ -3,7 +3,6 @@
|
|
|
|
#ifdef __KERNEL__
|
|
#include <linux/init.h>
|
|
-#include <linux/types.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/net.h>
|
|
#include <linux/if.h>
|
|
@@ -12,6 +11,7 @@
|
|
#include <linux/wait.h>
|
|
#include <linux/list.h>
|
|
#endif
|
|
+#include <linux/types.h>
|
|
#include <linux/compiler.h>
|
|
|
|
/* Responses from hook functions. */
|
|
--- a/include/linux/netfilter_arp/arp_tables.h
|
|
+++ b/include/linux/netfilter_arp/arp_tables.h
|
|
@@ -11,11 +11,11 @@
|
|
|
|
#ifdef __KERNEL__
|
|
#include <linux/if.h>
|
|
-#include <linux/types.h>
|
|
#include <linux/in.h>
|
|
#include <linux/if_arp.h>
|
|
#include <linux/skbuff.h>
|
|
#endif
|
|
+#include <linux/types.h>
|
|
#include <linux/compiler.h>
|
|
#include <linux/netfilter_arp.h>
|
|
|
|
--- a/include/linux/netfilter_ipv4/ip_tables.h
|
|
+++ b/include/linux/netfilter_ipv4/ip_tables.h
|
|
@@ -17,11 +17,11 @@
|
|
|
|
#ifdef __KERNEL__
|
|
#include <linux/if.h>
|
|
-#include <linux/types.h>
|
|
#include <linux/in.h>
|
|
#include <linux/ip.h>
|
|
#include <linux/skbuff.h>
|
|
#endif
|
|
+#include <linux/types.h>
|
|
#include <linux/compiler.h>
|
|
#include <linux/netfilter_ipv4.h>
|
|
|
|
--- a/include/linux/netfilter_ipv6/ip6_tables.h
|
|
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
|
|
@@ -17,11 +17,11 @@
|
|
|
|
#ifdef __KERNEL__
|
|
#include <linux/if.h>
|
|
-#include <linux/types.h>
|
|
#include <linux/in6.h>
|
|
#include <linux/ipv6.h>
|
|
#include <linux/skbuff.h>
|
|
#endif
|
|
+#include <linux/types.h>
|
|
#include <linux/compiler.h>
|
|
#include <linux/netfilter_ipv6.h>
|
|
|