diff options
| author | Andy Boyett <agb@openwrt.org> | 2008-06-19 08:05:08 +0000 |
|---|---|---|
| committer | Andy Boyett <agb@openwrt.org> | 2008-06-19 08:05:08 +0000 |
| commit | 573d7af53dd6f0dbbe41c3594d0704397ad07971 (patch) | |
| tree | 09ed8080ed58f952b4a5c2b876f71a9c024b8543 /target/linux/generic-2.6 | |
| parent | 11d0725b613d93e4a9213fa7596d4f1a6e709450 (diff) | |
| download | master-31e0f0ae-573d7af53dd6f0dbbe41c3594d0704397ad07971.tar.gz master-31e0f0ae-573d7af53dd6f0dbbe41c3594d0704397ad07971.tar.bz2 master-31e0f0ae-573d7af53dd6f0dbbe41c3594d0704397ad07971.zip | |
generic-2.6: Backport netfilter includes fix from 2.6.26 to 2.6.25 - Fixes compilation of numerous packages
SVN-Revision: 11539
Diffstat (limited to 'target/linux/generic-2.6')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.25/120-netfilter-headers-types.patch | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/120-netfilter-headers-types.patch b/target/linux/generic-2.6/patches-2.6.25/120-netfilter-headers-types.patch new file mode 100644 index 0000000000..79eb170c2c --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.25/120-netfilter-headers-types.patch @@ -0,0 +1,88 @@ +commit c8942f1f0a7e2160ebf2e51ba89e50ee5895a1e7 +Author: Patrick McHardy <kaber@trash.net> +Date: Wed May 21 14:08:38 2008 -0700 + + netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__ + + 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> + +diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h +index e4c6659..0c5eb7e 100644 +--- a/include/linux/netfilter.h ++++ b/include/linux/netfilter.h +@@ -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. */ +diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h +index dd9c97f..590ac3d 100644 +--- a/include/linux/netfilter_arp/arp_tables.h ++++ b/include/linux/netfilter_arp/arp_tables.h +@@ -11,11 +11,11 @@ + + #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> + +diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h +index bfc889f..092bd50 100644 +--- a/include/linux/netfilter_ipv4/ip_tables.h ++++ b/include/linux/netfilter_ipv4/ip_tables.h +@@ -17,11 +17,11 @@ + + #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> + +diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h +index f2507dc..1089e33 100644 +--- a/include/linux/netfilter_ipv6/ip6_tables.h ++++ b/include/linux/netfilter_ipv6/ip6_tables.h +@@ -17,11 +17,11 @@ + + #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> + |