target/linux/generic/patches-2.6.25/120-netfilter-headers-types.patch

   1 commit c8942f1f0a7e2160ebf2e51ba89e50ee5895a1e7
   2 Author: Patrick McHardy <kaber@trash.net>
   3 Date:   Wed May 21 14:08:38 2008 -0700
   4
   5     netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__
   6
   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.
  12
  13     Reported and Tested by Greg Steuck.
  14
  15     Signed-off-by: Patrick McHardy <kaber@trash.net>
  16     Signed-off-by: David S. Miller <davem@davemloft.net>
  17
  18 --- a/include/linux/netfilter.h
  19 +++ b/include/linux/netfilter.h
  20 @@ -3,7 +3,6 @@
  21
  22  #ifdef __KERNEL__
  23  #include <linux/init.h>
  24 -#include <linux/types.h>
  25  #include <linux/skbuff.h>
  26  #include <linux/net.h>
  27  #include <linux/if.h>
  28 @@ -12,6 +11,7 @@
  29  #include <linux/wait.h>
  30  #include <linux/list.h>
  31  #endif
  32 +#include <linux/types.h>
  33  #include <linux/compiler.h>
  34
  35  /* Responses from hook functions. */
  36 --- a/include/linux/netfilter_arp/arp_tables.h
  37 +++ b/include/linux/netfilter_arp/arp_tables.h
  38 @@ -11,11 +11,11 @@
  39
  40  #ifdef __KERNEL__
  41  #include <linux/if.h>
  42 -#include <linux/types.h>
  43  #include <linux/in.h>
  44  #include <linux/if_arp.h>
  45  #include <linux/skbuff.h>
  46  #endif
  47 +#include <linux/types.h>
  48  #include <linux/compiler.h>
  49  #include <linux/netfilter_arp.h>
  50
  51 --- a/include/linux/netfilter_ipv4/ip_tables.h
  52 +++ b/include/linux/netfilter_ipv4/ip_tables.h
  53 @@ -17,11 +17,11 @@
  54
  55  #ifdef __KERNEL__
  56  #include <linux/if.h>
  57 -#include <linux/types.h>
  58  #include <linux/in.h>
  59  #include <linux/ip.h>
  60  #include <linux/skbuff.h>
  61  #endif
  62 +#include <linux/types.h>
  63  #include <linux/compiler.h>
  64  #include <linux/netfilter_ipv4.h>
  65
  66 --- a/include/linux/netfilter_ipv6/ip6_tables.h
  67 +++ b/include/linux/netfilter_ipv6/ip6_tables.h
  68 @@ -17,11 +17,11 @@
  69
  70  #ifdef __KERNEL__
  71  #include <linux/if.h>
  72 -#include <linux/types.h>
  73  #include <linux/in6.h>
  74  #include <linux/ipv6.h>
  75  #include <linux/skbuff.h>
  76  #endif
  77 +#include <linux/types.h>
  78  #include <linux/compiler.h>
  79  #include <linux/netfilter_ipv6.h>
  80