diff options
author | Florian Westphal <fw@strlen.de> | 2017-12-07 16:28:26 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-01-08 18:01:11 +0100 |
commit | 2a95183a5e0375df756efb2ca37602d71e8455f9 (patch) | |
tree | 4ab9eaf7114711a553c6152cbba318349b5ff16e /net/netfilter/nf_queue.c | |
parent | bb4badf3a3dc81190f7c1c1fa063cdefb18df45f (diff) | |
download | linux-stable-2a95183a5e0375df756efb2ca37602d71e8455f9.tar.gz linux-stable-2a95183a5e0375df756efb2ca37602d71e8455f9.tar.bz2 linux-stable-2a95183a5e0375df756efb2ca37602d71e8455f9.zip |
netfilter: don't allocate space for arp/bridge hooks unless needed
no need to define hook points if the family isn't supported.
Because we need these hooks for either nftables, arp/ebtables
or the 'call-iptables' hack we have in the bridge layer add two
new dependencies, NETFILTER_FAMILY_{ARP,BRIDGE}, and have the
users select them.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_queue.c')
-rw-r--r-- | net/netfilter/nf_queue.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c index 836aeb08686e..0c02fdb7efc9 100644 --- a/net/netfilter/nf_queue.c +++ b/net/netfilter/nf_queue.c @@ -204,8 +204,10 @@ repeat: static struct nf_hook_entries *nf_hook_entries_head(const struct net *net, u8 pf, u8 hooknum) { switch (pf) { +#ifdef CONFIG_NETFILTER_FAMILY_BRIDGE case NFPROTO_BRIDGE: return rcu_dereference(net->nf.hooks_bridge[hooknum]); +#endif case NFPROTO_IPV4: return rcu_dereference(net->nf.hooks_ipv4[hooknum]); case NFPROTO_IPV6: |