[kernel] r11446 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Maximilian Attems]

Author: maks
Date: Fri May 23 09:43:08 2008
New Revision: 11446

Log:
netfilter: Move linux/types.h inclusions outside of __KERNEL__.

backport upstream patch.
thanks Lucas Nussbaum <lucas at lucas-nussbaum.net> for pointing to
upstream patch.


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/0001-netfilter-Move-linux-types.h-inclusions-outside-of.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/4

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Fri May 23 09:43:08 2008
@@ -42,6 +42,8 @@
     - x86: sysfs cpu?/topology is empty in 2.6.25 (32-bit Intel system)
     - XFRM: AUDIT: Fix flowlabel text format ambibuity.
   * Update userspace merged HZ alpha fixed version.
+  * Backport netfilter: Move linux/types.h inclusions outside of #ifdef
+    __KERNEL__. (closes: #479899)
  
   [ Bastian Blank ]
   * Fix ABI changes from: ipvs: fix oops in backup for fwmark conn templates

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/0001-netfilter-Move-linux-types.h-inclusions-outside-of.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/0001-netfilter-Move-linux-types.h-inclusions-outside-of.patch	Fri May 23 09:43:08 2008
@@ -0,0 +1,96 @@
+From c8942f1f0a7e2160ebf2e51ba89e50ee5895a1e7 Mon Sep 17 00:00:00 2001
+From: Patrick McHardy <kaber at trash.net>
+Date: Wed, 21 May 2008 14:08:38 -0700
+Subject: [PATCH] netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__
+
+Greg Steuck <greg at 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 at trash.net>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ include/linux/netfilter.h                 |    2 +-
+ include/linux/netfilter_arp/arp_tables.h  |    2 +-
+ include/linux/netfilter_ipv4/ip_tables.h  |    2 +-
+ include/linux/netfilter_ipv6/ip6_tables.h |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+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/if.h>
+@@ -12,6 +11,7 @@
+ #include <linux/wait.h>
+ #include <linux/list.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>
+ 
+-- 
+1.5.5.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/4
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/4	(original)
+++ dists/sid/linux-2.6/debian/patches/series/4	Fri May 23 09:43:08 2008
@@ -2,3 +2,4 @@
 - bugfix/all/unbreak-HZ-userspace.patch
 + bugfix/all/unbreak-HZ-userspace-2.patch
 + bugfix/all/stable/2.6.25.4-abi-1.patch
++ bugfix/all/0001-netfilter-Move-linux-types.h-inclusions-outside-of.patch