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: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/linux/netfilter_defs.h b/include/linux/netfilter_defs.h
index dc6111adea06de701a7054857e89aa2d984c1cbe..fdcdf2bf34df0cc22fb17a57bf513a479ffbe2dd 100644 (file)
--- a/include/linux/netfilter_defs.h
+++ b/include/linux/netfilter_defs.h
@@ -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

diff --git a/include/uapi/linux/netfilter_arp.h b/include/uapi/linux/netfilter_arp.h
index 81b6a4cbcb724ea7c357dc12ebb4031a9996c262..791dfc5ae907c35ab36eff01344bf9b695231395 100644 (file)
--- a/include/uapi/linux/netfilter_arp.h
+++ b/include/uapi/linux/netfilter_arp.h
@@ -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 */

diff --git a/include/uapi/linux/netfilter_decnet.h b/include/uapi/linux/netfilter_decnet.h
index 9089c38f6abeaf8a6a8350ca74aa2a2849ea2c83..61f1c7dfd03307728988812be50af14a35d5a5c7 100644 (file)
--- a/include/uapi/linux/netfilter_decnet.h
+++ b/include/uapi/linux/netfilter_decnet.h
@@ -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,