diff options
author | Igor Maravić <igorm@etf.rs> | 2011-12-12 02:58:25 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-16 20:49:52 (GMT) |
commit | e6373c4c0ecb3a944c34117a3daeac315d641b5f (patch) | |
tree | 25f21dc82327c56474b0e894c832faef084c176b /net/bridge/br_netfilter.c | |
parent | c0cd115667bcd23c2a31fe2114beaab3608de68c (diff) | |
download | linux-fsl-qoriq-e6373c4c0ecb3a944c34117a3daeac315d641b5f.tar.xz |
net:bridge: use IS_ENABLED
Use IS_ENABLED(CONFIG_FOO)
instead of defined(CONFIG_FOO) || defined (CONFIG_FOO_MODULE)
Signed-off-by: Igor Maravić <igorm@etf.rs>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_netfilter.c')
-rw-r--r-- | net/bridge/br_netfilter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 834dfab..52e4460 100644 --- 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; |