* [PATCH] netfilter: Move linux/in.h and linux/in6.h inclusions outside of #ifdef __KERNEL__
@ 2008-07-31 8:35 Matt Kraai
2008-08-01 6:30 ` Patrick McHardy
0 siblings, 1 reply; 2+ messages in thread
From: Matt Kraai @ 2008-07-31 8:35 UTC (permalink / raw)
To: Patrick McHardy, David S. Miller; +Cc: linux-kernel, akpm, stable
From: Matt Kraai <kraai@ftbfs.org>
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 <kraai@ftbfs.org>
---
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. */
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] netfilter: Move linux/in.h and linux/in6.h inclusions outside of #ifdef __KERNEL__
2008-07-31 8:35 [PATCH] netfilter: Move linux/in.h and linux/in6.h inclusions outside of #ifdef __KERNEL__ Matt Kraai
@ 2008-08-01 6:30 ` Patrick McHardy
0 siblings, 0 replies; 2+ messages in thread
From: Patrick McHardy @ 2008-08-01 6:30 UTC (permalink / raw)
To: Matt Kraai; +Cc: David S. Miller, linux-kernel, akpm, stable
Matt Kraai wrote:
> From: Matt Kraai <kraai@ftbfs.org>
>
> 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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-08-01 6:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-31 8:35 [PATCH] netfilter: Move linux/in.h and linux/in6.h inclusions outside of #ifdef __KERNEL__ Matt Kraai
2008-08-01 6:30 ` Patrick McHardy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox