From: Andy Boyett Date: Thu, 19 Jun 2008 08:05:08 +0000 (+0000) Subject: generic-2.6: Backport netfilter includes fix from 2.6.26 to 2.6.25 - Fixes compilatio... X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=573d7af53dd6f0dbbe41c3594d0704397ad07971;p=librecmc%2Flibrecmc.git generic-2.6: Backport netfilter includes fix from 2.6.26 to 2.6.25 - Fixes compilation of numerous packages SVN-Revision: 11539 --- 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 +Date: Wed May 21 14:08:38 2008 -0700 + + netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__ + + Greg Steuck 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 + Signed-off-by: David S. Miller + +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 +-#include + #include + #include + #include +@@ -14,6 +13,7 @@ + #include + #include + #endif ++#include + #include + + /* 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 +-#include + #include + #include + #include + #endif ++#include + #include + #include + +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 +-#include + #include + #include + #include + #endif ++#include + #include + #include + +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 +-#include + #include + #include + #include + #endif ++#include + #include + #include +