commit 24de3d377539e384621c5b8f8f8d8d01852dddc8
author Duan Jiong <duanj.fnst@cn.fujitsu.com> Mon Jun 30 09:19:32 2014 +0800
committer Pablo Neira Ayuso <pablo@netfilter.org> Mon Jun 30 11:38:03 2014 +0200
tree ed111914a78a30dfb8165a0edbb4a56e2e95c69d
parent 5cbfda2043814f4989efad12be02086a2e4c59fd

netfilter: use IS_ENABLED() macro

replace:
 #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
with
 #if IS_ENABLED(CONFIG_NF_CT_NETLINK)

replace:
 #if !defined(CONFIG_NF_NAT) && !defined(CONFIG_NF_NAT_MODULE)
with
 #if !IS_ENABLED(CONFIG_NF_NAT)

replace:
 #if !defined(CONFIG_NF_CONNTRACK) && !defined(CONFIG_NF_CONNTRACK_MODULE)
with
 #if !IS_ENABLED(CONFIG_NF_CONNTRACK)

And add missing:
 IS_ENABLED(CONFIG_NF_CT_NETLINK)

in net/ipv{4,6}/netfilter/nf_nat_l3proto_ipv{4,6}.c

Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>