Duan Jiong 24de3d3775 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>
2014-06-30 11:38:03 +02:00
..
2014-06-04 22:46:38 -07:00
2014-05-18 21:10:29 -04:00
2014-06-04 22:46:38 -07:00
2014-06-02 11:00:41 -07:00
2013-12-29 16:34:25 -05:00
2013-10-08 23:19:24 -04:00
2014-05-12 14:03:41 -04:00
2014-06-02 11:00:41 -07:00
2014-06-02 11:00:41 -07:00
2013-09-03 21:41:43 -04:00
2014-02-25 07:04:16 +01:00
2014-02-19 11:41:25 +01:00
2014-05-07 16:06:05 -04:00
2014-06-02 11:00:41 -07:00
2014-06-02 11:00:41 -07:00
2014-06-05 00:49:51 -07:00
2014-06-04 22:46:38 -07:00
2012-03-11 23:42:51 -07:00
2014-05-23 16:28:53 -04:00
2013-05-31 17:19:05 -07:00