Commit a263653e authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

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: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent 10c04a8e

include/linux/netfilter.h

+2 −4
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ 
#include <linux/wait.h>

#include <linux/list.h>

#include <linux/static_key.h>

#include <uapi/linux/netfilter.h>

#include <linux/netfilter_defs.h>



#ifdef CONFIG_NETFILTER

static inline int NF_DROP_GETERR(int verdict)

{
@@ -38,9 +39,6 @@ static inline void nf_inet_addr_mask(const union nf_inet_addr *a1, 


int netfilter_init(void);



/* Largest hook number + 1 */

#define NF_MAX_HOOKS 8



struct sk_buff;



struct nf_hook_ops;

include/linux/netfilter_defs.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#ifndef __LINUX_NETFILTER_CORE_H_

#define __LINUX_NETFILTER_CORE_H_



#include <uapi/linux/netfilter.h>



/* Largest hook number + 1, see uapi/linux/netfilter_decnet.h */

#define NF_MAX_HOOKS 8



#endif

include/net/netns/netfilter.h

+1 −1
Original line number Diff line number Diff line 
#ifndef __NETNS_NETFILTER_H

#define __NETNS_NETFILTER_H



#include <linux/netfilter.h>

#include <linux/netfilter_defs.h>



struct proc_dir_entry;

struct nf_logger;

include/net/netns/x_tables.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#define __NETNS_X_TABLES_H



#include <linux/list.h>

#include <linux/netfilter.h>

#include <linux/netfilter_defs.h>



struct ebt_table;

include/uapi/linux/netfilter.h

+2 −1
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE