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

Commit 1109a90c authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: use IS_ENABLED(CONFIG_BRIDGE_NETFILTER) 



In 34666d46 ("netfilter: bridge: move br_netfilter out of the core"),
the bridge netfilter code has been modularized.

Use IS_ENABLED instead of ifdef to cover the module case.

Fixes: 34666d46 ("netfilter: bridge: move br_netfilter out of the core")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent c8d7b98b

net/core/skbuff.c

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ static void skb_release_head_state(struct sk_buff *skb) 
#if IS_ENABLED(CONFIG_NF_CONNTRACK)

	nf_conntrack_put(skb->nfct);

#endif

#ifdef CONFIG_BRIDGE_NETFILTER

#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)

	nf_bridge_put(skb->nf_bridge);

#endif

/* XXX: IS this still necessary? - JHS */

net/ipv4/ip_output.c

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) 


	hlen = iph->ihl * 4;

	mtu = mtu - hlen;	/* Size of data space */

#ifdef CONFIG_BRIDGE_NETFILTER

#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)

	if (skb->nf_bridge)

		mtu -= nf_bridge_mtu_reduction(skb);

#endif

net/ipv4/netfilter/ipt_REJECT.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <linux/netfilter/x_tables.h>

#include <linux/netfilter_ipv4/ip_tables.h>

#include <linux/netfilter_ipv4/ipt_REJECT.h>

#ifdef CONFIG_BRIDGE_NETFILTER

#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)

#include <linux/netfilter_bridge.h>

#endif

net/ipv4/netfilter/nf_defrag_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static enum ip_defrag_users nf_ct_defrag_user(unsigned int hooknum, 
		zone = nf_ct_zone((struct nf_conn *)skb->nfct);

#endif



#ifdef CONFIG_BRIDGE_NETFILTER

#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)

	if (skb->nf_bridge &&

	    skb->nf_bridge->mask & BRNF_NF_BRIDGE_PREROUTING)

		return IP_DEFRAG_CONNTRACK_BRIDGE_IN + zone;

net/ipv6/netfilter/nf_defrag_ipv6_hooks.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static enum ip6_defrag_users nf_ct6_defrag_user(unsigned int hooknum, 
		zone = nf_ct_zone((struct nf_conn *)skb->nfct);

#endif



#ifdef CONFIG_BRIDGE_NETFILTER

#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)

	if (skb->nf_bridge &&

	    skb->nf_bridge->mask & BRNF_NF_BRIDGE_PREROUTING)

		return IP6_DEFRAG_CONNTRACK_BRIDGE_IN + zone;