2008-07-31 09:26:18

by Matt Kraai

Subject: [PATCH] netfilter: Move linux/in.h and linux/in6.h inclusions outside of #ifdef __KERNEL__

From: Matt Kraai <[email protected]>

netfilter.h can't be used in userspace without including linux/in.h
and linux/in6.h first. netfilter.h includes its own linux/in.h and
linux/in6.h include statements, these are stripped by make
headers-install because they are inside #ifdef __KERNEL__ however.
Move them out to fix this.

Signed-off-by: Matt Kraai <[email protected]>

---

The original report of this bug is at
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=487103.

This patch applies to the latest linux-2.6 tree.

diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 0c5eb7e..6060e56 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -7,13 +7,13 @@
#include <linux/net.h>
#include <linux/netdevice.h>
#include <linux/if.h>
-#include <linux/in.h>
-#include <linux/in6.h>
#include <linux/wait.h>
#include <linux/list.h>
#include <net/net_namespace.h>
#endif
#include <linux/types.h>
+#include <linux/in.h>
+#include <linux/in6.h>
#include <linux/compiler.h>

/* Responses from hook functions. */

2008-08-01 06:31:12

by Patrick McHardy

Subject: Re: [PATCH] netfilter: Move linux/in.h and linux/in6.h inclusions outside of #ifdef __KERNEL__

Matt Kraai wrote:
> From: Matt Kraai <[email protected]>
>
> netfilter.h can't be used in userspace without including linux/in.h
> and linux/in6.h first. netfilter.h includes its own linux/in.h and
> linux/in6.h include statements, these are stripped by make
> headers-install because they are inside #ifdef __KERNEL__ however.
> Move them out to fix this.

Applied, thanks.