projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
net:bridge: use IS_ENABLED
[linux-block.git]
/
net
/
bridge
/
br_netfilter.c
diff --git
a/net/bridge/br_netfilter.c
b/net/bridge/br_netfilter.c
index 834dfabb30f93c81ac38de33258677f341c706d0..52e44605fb7b45fc3dcd21e813eba81d418711f6 100644
(file)
--- a/
net/bridge/br_netfilter.c
+++ b/
net/bridge/br_netfilter.c
@@
-807,7
+807,7
@@
static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff *skb,
return NF_STOLEN;
}
-#if
defined(CONFIG_NF_CONNTRACK_IPV4) || defined(CONFIG_NF_CONNTRACK_IPV4_MODULE
)
+#if
IS_ENABLED(CONFIG_NF_CONNTRACK_IPV4
)
static int br_nf_dev_queue_xmit(struct sk_buff *skb)
{
int ret;