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 --- a/include/linux/netfilter.h
19 +++ b/include/linux/netfilter.h
23 #include <linux/init.h>
24 -#include <linux/types.h>
25 #include <linux/skbuff.h>
26 #include <linux/net.h>
29 #include <linux/wait.h>
30 #include <linux/list.h>
32 +#include <linux/types.h>
33 #include <linux/compiler.h>
35 /* Responses from hook functions. */
36 --- a/include/linux/netfilter_arp/arp_tables.h
37 +++ b/include/linux/netfilter_arp/arp_tables.h
42 -#include <linux/types.h>
44 #include <linux/if_arp.h>
45 #include <linux/skbuff.h>
47 +#include <linux/types.h>
48 #include <linux/compiler.h>
49 #include <linux/netfilter_arp.h>
51 --- a/include/linux/netfilter_ipv4/ip_tables.h
52 +++ b/include/linux/netfilter_ipv4/ip_tables.h
57 -#include <linux/types.h>
60 #include <linux/skbuff.h>
62 +#include <linux/types.h>
63 #include <linux/compiler.h>
64 #include <linux/netfilter_ipv4.h>
66 --- a/include/linux/netfilter_ipv6/ip6_tables.h
67 +++ b/include/linux/netfilter_ipv6/ip6_tables.h
72 -#include <linux/types.h>
73 #include <linux/in6.h>
74 #include <linux/ipv6.h>
75 #include <linux/skbuff.h>
77 +#include <linux/types.h>
78 #include <linux/compiler.h>
79 #include <linux/netfilter_ipv6.h>