Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24de3d37 authored by Duan Jiong's avatar Duan Jiong Committed by Pablo Neira Ayuso
Browse files

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: default avatarDuan Jiong <duanj.fnst@cn.fujitsu.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 5cbfda20

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+2 −2
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ getorigdst(struct sock *sk, int optval, void __user *user, int *len) 
	return -ENOENT;

}



#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)

#if IS_ENABLED(CONFIG_NF_CT_NETLINK)



#include <linux/netfilter/nfnetlink.h>

#include <linux/netfilter/nfnetlink_conntrack.h>
@@ -388,7 +388,7 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = { 
	.invert_tuple	 = ipv4_invert_tuple,

	.print_tuple	 = ipv4_print_tuple,

	.get_l4proto	 = ipv4_get_l4proto,

#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)

#if IS_ENABLED(CONFIG_NF_CT_NETLINK)

	.tuple_to_nlattr = ipv4_tuple_to_nlattr,

	.nlattr_tuple_size = ipv4_nlattr_tuple_size,

	.nlattr_to_tuple = ipv4_nlattr_to_tuple,

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+2 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ icmp_error(struct net *net, struct nf_conn *tmpl, 
	return icmp_error_message(net, tmpl, skb, ctinfo, hooknum);

}



#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)

#if IS_ENABLED(CONFIG_NF_CT_NETLINK)



#include <linux/netfilter/nfnetlink.h>

#include <linux/netfilter/nfnetlink_conntrack.h>
@@ -408,7 +408,7 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly = 
	.error			= icmp_error,

	.destroy		= NULL,

	.me			= NULL,

#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)

#if IS_ENABLED(CONFIG_NF_CT_NETLINK)

	.tuple_to_nlattr	= icmp_tuple_to_nlattr,

	.nlattr_tuple_size	= icmp_nlattr_tuple_size,

	.nlattr_to_tuple	= icmp_nlattr_to_tuple,

net/ipv4/netfilter/nf_defrag_ipv4.c

+4 −4
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/netfilter_bridge.h>

#include <linux/netfilter_ipv4.h>

#include <net/netfilter/ipv4/nf_defrag_ipv4.h>

#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

#if IS_ENABLED(CONFIG_NF_CONNTRACK)

#include <net/netfilter/nf_conntrack.h>

#endif

#include <net/netfilter/nf_conntrack_zones.h>
@@ -45,7 +45,7 @@ static enum ip_defrag_users nf_ct_defrag_user(unsigned int hooknum, 
{

	u16 zone = NF_CT_DEFAULT_ZONE;



#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

#if IS_ENABLED(CONFIG_NF_CONNTRACK)

	if (skb->nfct)

		zone = nf_ct_zone((struct nf_conn *)skb->nfct);

#endif
@@ -74,8 +74,8 @@ static unsigned int ipv4_conntrack_defrag(const struct nf_hook_ops *ops, 
	    inet->nodefrag)

		return NF_ACCEPT;



#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

#if !defined(CONFIG_NF_NAT) && !defined(CONFIG_NF_NAT_MODULE)

#if IS_ENABLED(CONFIG_NF_CONNTRACK)

#if !IS_ENABLED(CONFIG_NF_NAT)

	/* Previously seen (loopback)?  Ignore.  Do this before

	   fragment check. */

	if (skb->nfct && !nf_ct_is_template((struct nf_conn *)skb->nfct))

net/ipv4/netfilter/nf_nat_l3proto_ipv4.c

+4 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ static void nf_nat_ipv4_csum_recalc(struct sk_buff *skb, 
					 htons(oldlen), htons(datalen), 1);

}



#if IS_ENABLED(CONFIG_NF_CT_NETLINK)

static int nf_nat_ipv4_nlattr_to_range(struct nlattr *tb[],

				       struct nf_nat_range *range)

{
@@ -169,6 +170,7 @@ static int nf_nat_ipv4_nlattr_to_range(struct nlattr *tb[], 


	return 0;

}

#endif



static const struct nf_nat_l3proto nf_nat_l3proto_ipv4 = {

	.l3proto		= NFPROTO_IPV4,
@@ -177,7 +179,9 @@ static const struct nf_nat_l3proto nf_nat_l3proto_ipv4 = { 
	.manip_pkt		= nf_nat_ipv4_manip_pkt,

	.csum_update		= nf_nat_ipv4_csum_update,

	.csum_recalc		= nf_nat_ipv4_csum_recalc,

#if IS_ENABLED(CONFIG_NF_CT_NETLINK)

	.nlattr_to_range	= nf_nat_ipv4_nlattr_to_range,

#endif

#ifdef CONFIG_XFRM

	.decode_session		= nf_nat_ipv4_decode_session,

#endif

net/ipv4/netfilter/nf_nat_proto_gre.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static const struct nf_nat_l4proto gre = { 
	.manip_pkt		= gre_manip_pkt,

	.in_range		= nf_nat_l4proto_in_range,

	.unique_tuple		= gre_unique_tuple,

#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)

#if IS_ENABLED(CONFIG_NF_CT_NETLINK)

	.nlattr_to_range	= nf_nat_l4proto_nlattr_to_range,

#endif

};