1 commit c8942f1f0a7e2160ebf2e51ba89e50ee5895a1e7
2 Author: Patrick McHardy <kaber@trash.net>
3 Date: Wed May 21 14:08:38 2008 -0700
5 netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__
7 Greg Steuck <greg@nest.cx> points out that some of the netfilter
8 headers can't be used in userspace without including linux/types.h
9 first. The headers include their own linux/types.h include statements,
10 these are stripped by make headers-install because they are inside
11 #ifdef __KERNEL__ however. Move them out to fix this.
13 Reported and Tested by Greg Steuck.
15 Signed-off-by: Patrick McHardy <kaber@trash.net>
16 Signed-off-by: David S. Miller <davem@davemloft.net>
18 diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
19 index e4c6659..0c5eb7e 100644
20 --- a/include/linux/netfilter.h
21 +++ b/include/linux/netfilter.h
25 #include <linux/init.h>
26 -#include <linux/types.h>
27 #include <linux/skbuff.h>
28 #include <linux/net.h>
29 #include <linux/netdevice.h>
31 #include <linux/list.h>
32 #include <net/net_namespace.h>
34 +#include <linux/types.h>
35 #include <linux/compiler.h>
37 /* Responses from hook functions. */
38 diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h
39 index dd9c97f..590ac3d 100644
40 --- a/include/linux/netfilter_arp/arp_tables.h
41 +++ b/include/linux/netfilter_arp/arp_tables.h
46 -#include <linux/types.h>
48 #include <linux/if_arp.h>
49 #include <linux/skbuff.h>
51 +#include <linux/types.h>
52 #include <linux/compiler.h>
53 #include <linux/netfilter_arp.h>
55 diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
56 index bfc889f..092bd50 100644
57 --- a/include/linux/netfilter_ipv4/ip_tables.h
58 +++ b/include/linux/netfilter_ipv4/ip_tables.h
63 -#include <linux/types.h>
66 #include <linux/skbuff.h>
68 +#include <linux/types.h>
69 #include <linux/compiler.h>
70 #include <linux/netfilter_ipv4.h>
72 diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
73 index f2507dc..1089e33 100644
74 --- a/include/linux/netfilter_ipv6/ip6_tables.h
75 +++ b/include/linux/netfilter_ipv6/ip6_tables.h
80 -#include <linux/types.h>
81 #include <linux/in6.h>
82 #include <linux/ipv6.h>
83 #include <linux/skbuff.h>
85 +#include <linux/types.h>
86 #include <linux/compiler.h>
87 #include <linux/netfilter_ipv6.h>