diff mbox series

[18/52] netfilter: reduce NF_MAX_HOOKS define

Message ID	20180108202000.12989-19-pablo@netfilter.org
State	Accepted
Delegated to:	Pablo Neira
Headers	show Return-Path: <netfilter-devel-owner@vger.kernel.org> sender: pneira@us.es) by entrada.int (Postfix) with ESMTPA id 833234196FC4; Mon, 8 Jan 2018 21:20:20 +0100 (CET) From: Pablo Neira Ayuso <pablo@netfilter.org> To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 18/52] netfilter: reduce NF_MAX_HOOKS define Date: Mon, 8 Jan 2018 21:19:26 +0100 Message-Id: <20180108202000.12989-19-pablo@netfilter.org> In-Reply-To: <20180108202000.12989-1-pablo@netfilter.org> References: <20180108202000.12989-1-pablo@netfilter.org> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk
Series	[01/52] netfilter: conntrack: remove nlattr_size pointer from l4proto trackers \| expand [01/52] netfilter: conntrack: remove nlattr_size pointer from l4proto trackers [02/52] netfilter: conntrack: constify list of builtin trackers [03/52] netfilter: conntrack: l4 protocol trackers can be const [04/52] netfilter: mark expected switch fall-throughs [05/52] netfilter: conntrack: timeouts can be const [06/52] netfilter: ipvs: Remove useless ipvsh param of frag_safe_skb_hp [07/52] netfilter: ipset: use nfnl_mutex_is_locked [08/52] netfilter: ipset: add resched points during set listing [09/52] netfilter: nf_conntrack_h323: Remove unwanted comments. [10/52] netfilter: core: make nf_unregister_net_hooks simple wrapper again [11/52] netfilter: core: remove synchronize_net call if nfqueue is used [12/52] netfilter: core: free hooks with call_rcu [13/52] netfilter: reduce size of hook entry point locations [14/52] netfilter: add defines for arp/decnet max hooks [15/52] netfilter: reduce hook array sizes to what is needed [16/52] netfilter: don't allocate space for decnet hooks unless needed [17/52] netfilter: don't allocate space for arp/bridge hooks unless needed [18/52] netfilter: reduce NF_MAX_HOOKS define [19/52] netfilter: xtables: add and use xt_request_find_table_lock [20/52] netfilter: core: only allow one nat hook per hook point [21/52] netfilter: nf_tables: reject nat hook registration if prio is before conntrack [22/52] netfilter: nf_tables_arp: don't set forward chain [23/52] netfilter: nf_tables: explicit nft_set_pktinfo() call from hook path [24/52] netfilter: nf_tables: add nft_set_is_anonymous() helper [25/52] netfilter: core: add nf_remove_net_hook [26/52] netfilter: core: pass hook number, family and device to nf_find_hook_list() [27/52] netfilter: core: pass family as parameter to nf_remove_net_hook() [28/52] netfilter: core: support for NFPROTO_INET hook registration [29/52] netfilter: nf_tables_inet: don't use multihook infrastructure anymore [30/52] netfilter: nf_tables: remove multihook chains and families [31/52] netfilter: nf_tables: remove hooks from family definition [32/52] netfilter: connlimit: split xt_connlimit into front and backend [33/52] netfilter: move checksum indirection to struct nf_ipv6_ops [34/52] netfilter: move checksum_partial indirection to struct nf_ipv6_ops [35/52] netfilter: remove saveroute indirection in struct nf_afinfo [36/52] netfilter: move route indirection to struct nf_ipv6_ops [37/52] netfilter: move reroute indirection to struct nf_ipv6_ops [38/52] netfilter: remove route_key_size field in struct nf_afinfo [39/52] netfilter: remove struct nf_afinfo and its helper functions [40/52] netfilter: meta: secpath support [41/52] netfilter: remove defensive check on malformed packets from raw sockets [42/52] netfilter: nf_tables: remove nft_dereference() [43/52] netfilter: nf_conntrack: add IPS_OFFLOAD status bit [44/52] netfilter: nf_tables: add flow table netlink frontend [45/52] netfilter: add generic flow table infrastructure [46/52] netfilter: flow table support for IPv4 [47/52] netfilter: flow table support for IPv6 [48/52] netfilter: flow table support for the mixed IPv4/IPv6 family [49/52] netfilter: nf_tables: flow offload expression [50/52] netfilter: ipset: use swap macro instead of _manually_ swapping values [51/52] netfilter: ipset: Fix "don't update counters" mode when counters used at the matching [52/52] netfilter: ipset: Missing nfnl_lock()/nfnl_unlock() is added to ip_set_net_exit()

Commit Message

Pablo Neira Ayuso Jan. 8, 2018, 8:19 p.m. UTC

From: Florian Westphal <fw@strlen.de>

This can be same as NF_INET_NUMHOOKS if we don't support DECNET.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 include/linux/netfilter_defs.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/include/linux/netfilter_defs.h b/include/linux/netfilter_defs.h
index fdcdf2bf34df..8dddfb151f00 100644
--- a/include/linux/netfilter_defs.h
+++ b/include/linux/netfilter_defs.h
@@ -4,13 +4,17 @@ 
 
 #include <uapi/linux/netfilter.h>
 
-/* 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
 
+#if IS_ENABLED(CONFIG_DECNET)
+/* Largest hook number + 1, see uapi/linux/netfilter_decnet.h */
+#define NF_MAX_HOOKS	NF_DN_NUMHOOKS
+#else
+#define NF_MAX_HOOKS	NF_INET_NUMHOOKS
+#endif
+
 #endif