diff options
| author | Pablo Neira Ayuso | 2015-06-17 17:28:27 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2015-06-18 21:14:31 +0200 |
| commit | a263653ed798216c0069922d7b5237ca49436007 (patch) | |
| tree | dc6cf8cc8519a3aa4bbb988699bc75042470a793 /include/uapi/linux/netfilter.h | |
| parent | netfilter: use forward declaration instead of including linux/proc_fs.h (diff) | |
| download | kernel-qcow2-linux-a263653ed798216c0069922d7b5237ca49436007.tar.gz kernel-qcow2-linux-a263653ed798216c0069922d7b5237ca49436007.tar.xz kernel-qcow2-linux-a263653ed798216c0069922d7b5237ca49436007.zip | |
netfilter: don't pull include/linux/netfilter.h from netns headers
This pulls the full hook netfilter definitions from all those that include
net_namespace.h.
Instead let's just include the bare minimum required in the new
linux/netfilter_defs.h file, and use it from the netfilter netns header files.
I also needed to include in.h and in6.h from linux/netfilter.h otherwise we hit
this compilation error:
In file included from include/linux/netfilter_defs.h:4:0,
from include/net/netns/netfilter.h:4,
from include/net/net_namespace.h:22,
from include/linux/netdevice.h:43,
from net/netfilter/nfnetlink_queue_core.c:23:
include/uapi/linux/netfilter.h:76:17: error: field ‘in’ has incomplete type struct in_addr in;
And also explicit include linux/netfilter.h in several spots.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'include/uapi/linux/netfilter.h')
| -rw-r--r-- | include/uapi/linux/netfilter.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/netfilter.h b/include/uapi/linux/netfilter.h index 177027cce6b3..d93f949d1d9a 100644 --- a/include/uapi/linux/netfilter.h +++ b/include/uapi/linux/netfilter.h @@ -4,7 +4,8 @@ #include <linux/types.h> #include <linux/compiler.h> #include <linux/sysctl.h> - +#include <linux/in.h> +#include <linux/in6.h> /* Responses from hook functions. */ #define NF_DROP 0 |