iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__

Browse Source 
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>
This commit is contained in:
Patrick McHardy 2008-05-21 14:08:38 -07:00 committed by David S. Miller
parent 4da5105687
commit c8942f1f0a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/netfilter.h
View File

@ -3,7 +3,6 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/init.h> #include <linux/init.h>
#include <linux/types.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/net.h> #include <linux/net.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
@ -14,6 +13,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <net/net_namespace.h> #include <net/net_namespace.h>
#endif #endif
#include <linux/types.h>
#include <linux/compiler.h> #include <linux/compiler.h>
/* Responses from hook functions. */ /* Responses from hook functions. */

2
include/linux/netfilter_arp/arp_tables.h
View File

@ -11,11 +11,11 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/if.h> #include <linux/if.h>
#include <linux/types.h>
#include <linux/in.h> #include <linux/in.h>
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#endif #endif
#include <linux/types.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/netfilter_arp.h> #include <linux/netfilter_arp.h>

2
include/linux/netfilter_ipv4/ip_tables.h
View File

@ -17,11 +17,11 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/if.h> #include <linux/if.h>
#include <linux/types.h>
#include <linux/in.h> #include <linux/in.h>
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#endif #endif
#include <linux/types.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/netfilter_ipv4.h> #include <linux/netfilter_ipv4.h>

2
include/linux/netfilter_ipv6/ip6_tables.h
View File

@ -17,11 +17,11 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/if.h> #include <linux/if.h>
#include <linux/types.h>
#include <linux/in6.h> #include <linux/in6.h>
#include <linux/ipv6.h> #include <linux/ipv6.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#endif #endif
#include <linux/types.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/netfilter_ipv6.h> #include <linux/netfilter_ipv6.h>