tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

netfilter: use IS_ENABLED(CONFIG_BRIDGE_NETFILTER)

In 34666d4 ("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: 34666d4 ("netfilter: bridge: move br_netfilter out of the core")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Pablo Neira Ayuso 1109a90c c8d7b98b

+20 -20
+1 -1
net/core/skbuff.c
··· 566 566 #if IS_ENABLED(CONFIG_NF_CONNTRACK) 567 567 nf_conntrack_put(skb->nfct); 568 568 #endif 569 - #ifdef CONFIG_BRIDGE_NETFILTER 569 + #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) 570 570 nf_bridge_put(skb->nf_bridge); 571 571 #endif 572 572 /* XXX: IS this still necessary? - JHS */
+1 -1
net/ipv4/ip_output.c
··· 516 516 517 517 hlen = iph->ihl * 4; 518 518 mtu = mtu - hlen; /* Size of data space */ 519 - #ifdef CONFIG_BRIDGE_NETFILTER 519 + #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) 520 520 if (skb->nf_bridge) 521 521 mtu -= nf_bridge_mtu_reduction(skb); 522 522 #endif
+1 -1
net/ipv4/netfilter/ipt_REJECT.c
··· 20 20 #include <linux/netfilter/x_tables.h> 21 21 #include <linux/netfilter_ipv4/ip_tables.h> 22 22 #include <linux/netfilter_ipv4/ipt_REJECT.h> 23 - #ifdef CONFIG_BRIDGE_NETFILTER 23 + #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) 24 24 #include <linux/netfilter_bridge.h> 25 25 #endif 26 26
+1 -1
net/ipv4/netfilter/nf_defrag_ipv4.c
··· 50 50 zone = nf_ct_zone((struct nf_conn *)skb->nfct); 51 51 #endif 52 52 53 - #ifdef CONFIG_BRIDGE_NETFILTER 53 + #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) 54 54 if (skb->nf_bridge && 55 55 skb->nf_bridge->mask & BRNF_NF_BRIDGE_PREROUTING) 56 56 return IP_DEFRAG_CONNTRACK_BRIDGE_IN + zone;
+1 -1
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
··· 40 40 zone = nf_ct_zone((struct nf_conn *)skb->nfct); 41 41 #endif 42 42 43 - #ifdef CONFIG_BRIDGE_NETFILTER 43 + #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) 44 44 if (skb->nf_bridge && 45 45 skb->nf_bridge->mask & BRNF_NF_BRIDGE_PREROUTING) 46 46 return IP6_DEFRAG_CONNTRACK_BRIDGE_IN + zone;
+2 -2
net/netfilter/ipset/ip_set_hash_netiface.c
··· 237 237 #define SRCDIR (opt->flags & IPSET_DIM_TWO_SRC) 238 238 239 239 if (opt->cmdflags & IPSET_FLAG_PHYSDEV) { 240 - #ifdef CONFIG_BRIDGE_NETFILTER 240 + #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) 241 241 const struct nf_bridge_info *nf_bridge = skb->nf_bridge; 242 242 243 243 if (!nf_bridge) ··· 474 474 ip6_netmask(&e.ip, e.cidr); 475 475 476 476 if (opt->cmdflags & IPSET_FLAG_PHYSDEV) { 477 - #ifdef CONFIG_BRIDGE_NETFILTER 477 + #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) 478 478 const struct nf_bridge_info *nf_bridge = skb->nf_bridge; 479 479 480 480 if (!nf_bridge)
+1 -1
net/netfilter/nf_log_common.c
··· 158 158 '0' + loginfo->u.log.level, prefix, 159 159 in ? in->name : "", 160 160 out ? out->name : ""); 161 - #ifdef CONFIG_BRIDGE_NETFILTER 161 + #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) 162 162 if (skb->nf_bridge) { 163 163 const struct net_device *physindev; 164 164 const struct net_device *physoutdev;
+2 -2
net/netfilter/nf_queue.c
··· 52 52 dev_put(entry->indev); 53 53 if (entry->outdev) 54 54 dev_put(entry->outdev); 55 - #ifdef CONFIG_BRIDGE_NETFILTER 55 + #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) 56 56 if (entry->skb->nf_bridge) { 57 57 struct nf_bridge_info *nf_bridge = entry->skb->nf_bridge; 58 58 ··· 77 77 dev_hold(entry->indev); 78 78 if (entry->outdev) 79 79 dev_hold(entry->outdev); 80 - #ifdef CONFIG_BRIDGE_NETFILTER 80 + #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) 81 81 if (entry->skb->nf_bridge) { 82 82 struct nf_bridge_info *nf_bridge = entry->skb->nf_bridge; 83 83 struct net_device *physdev;