]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__
authorPatrick McHardy <kaber@trash.net>
Wed, 21 May 2008 21:08:38 +0000 (14:08 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 May 2008 21:08:38 +0000 (14:08 -0700)
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>
include/linux/netfilter.h
include/linux/netfilter_arp/arp_tables.h
include/linux/netfilter_ipv4/ip_tables.h
include/linux/netfilter_ipv6/ip6_tables.h

index e4c66593b5c697f32d140cdc34a121c1173425d9..0c5eb7ed8b3f75d65674bb7364423be0745a2e47 100644 (file)
@@ -3,7 +3,6 @@
 
 #ifdef __KERNEL__
 #include <linux/init.h>
-#include <linux/types.h>
 #include <linux/skbuff.h>
 #include <linux/net.h>
 #include <linux/netdevice.h>
@@ -14,6 +13,7 @@
 #include <linux/list.h>
 #include <net/net_namespace.h>
 #endif
+#include <linux/types.h>
 #include <linux/compiler.h>
 
 /* Responses from hook functions. */
index dd9c97f2d436ad9f6c381c835fe9ec713329b280..590ac3d6d5d67e349b28a146be534d14cefa29c3 100644 (file)
 
 #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>
 
index bfc889f9027660c60ad4d8c69c238963fd6648ca..092bd50581a9162df94c8a3b60a4477717e05f16 100644 (file)
 
 #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>
 
index f2507dcc57507871a9f19ccba25a083e03766049..1089e33cf633b167137e0d8737c72b1593b24eff 100644 (file)
 
 #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>