Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e58f33cc authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: add defines for arp/decnet max hooks 



The kernel already has defines for this, but they are in uapi exposed
headers.

Including these from netns.h causes build errors and also adds unneeded
dependencies on heads that we don't need.

So move these defines to netfilter_defs.h and place the uapi ones
in ifndef __KERNEL__ to keep them for userspace.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent b0f38338

include/linux/netfilter_defs.h

+6 −0
Original line number Diff line number Diff line
@@ -7,4 +7,10 @@ 
/* Largest hook number + 1, see uapi/linux/netfilter_decnet.h */

#define NF_MAX_HOOKS 8



/* in/out/forward only */

#define NF_ARP_NUMHOOKS 3



/* max hook is NF_DN_ROUTE (6), also see uapi/linux/netfilter_decnet.h */

#define NF_DN_NUMHOOKS 7



#endif

include/uapi/linux/netfilter_arp.h

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 
#define NF_ARP_IN	0

#define NF_ARP_OUT	1

#define NF_ARP_FORWARD	2



#ifndef __KERNEL__

#define NF_ARP_NUMHOOKS	3

#endif



#endif /* __LINUX_ARP_NETFILTER_H */

include/uapi/linux/netfilter_decnet.h

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ 
#define NFC_DN_IF_IN		0x0004

/* Output device. */

#define NFC_DN_IF_OUT		0x0008



/* kernel define is in netfilter_defs.h */

#define NF_DN_NUMHOOKS		7

#endif /* ! __KERNEL__ */



/* DECnet Hooks */
@@ -41,7 +44,6 @@ 
#define NF_DN_HELLO		5

/* Input Routing Packets */

#define NF_DN_ROUTE		6

#define NF_DN_NUMHOOKS		7



enum nf_dn_hook_priorities {

	NF_DN_PRI_FIRST = INT_MIN,