diff options
author | 2011-12-12 02:58:24 +0000 | |
---|---|---|
committer | 2011-12-16 15:49:52 -0500 | |
commit | c0cd115667bcd23c2a31fe2114beaab3608de68c (patch) | |
tree | 886a94793dcbe9797c593d465aa4f37039231422 /net/netfilter/nf_conntrack_h323_main.c | |
parent | net:x25: use IS_ENABLED (diff) | |
download | linux-c0cd115667bcd23c2a31fe2114beaab3608de68c.tar.gz linux-c0cd115667bcd23c2a31fe2114beaab3608de68c.tar.bz2 linux-c0cd115667bcd23c2a31fe2114beaab3608de68c.zip |
net:netfilter: 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/netfilter/nf_conntrack_h323_main.c')
-rw-r--r-- | net/netfilter/nf_conntrack_h323_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c index f9368f33e7af..813ad393d189 100644 --- a/net/netfilter/nf_conntrack_h323_main.c +++ b/net/netfilter/nf_conntrack_h323_main.c @@ -743,8 +743,7 @@ static int callforward_do_filter(const union nf_inet_addr *src, } break; } -#if defined(CONFIG_NF_CONNTRACK_IPV6) || \ - defined(CONFIG_NF_CONNTRACK_IPV6_MODULE) +#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6) case AF_INET6: { struct flowi6 fl1, fl2; struct rt6_info *rt1, *rt2; |