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

Commit e281db5c authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: nf_conntrack/nf_nat: fix incorrect config ifdefs 



The nf_conntrack_netlink config option is named CONFIG_NF_CT_NETLINK,
but multiple files use CONFIG_IP_NF_CONNTRACK_NETLINK or
CONFIG_NF_CONNTRACK_NETLINK for ifdefs.

Fix this and reformat all CONFIG_NF_CT_NETLINK ifdefs to only use a line.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ec68e97d

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+2 −4
Original line number Diff line number Diff line
@@ -379,8 +379,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 defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)



#include <linux/netfilter/nfnetlink.h>

#include <linux/netfilter/nfnetlink_conntrack.h>
@@ -435,8 +434,7 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 = { 
	.print_conntrack = ipv4_print_conntrack,

	.prepare	 = ipv4_prepare,

	.get_features	 = ipv4_get_features,

#if defined(CONFIG_NF_CT_NETLINK) || \

    defined(CONFIG_NF_CT_NETLINK_MODULE)

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

	.tuple_to_nfattr = ipv4_tuple_to_nfattr,

	.nfattr_to_tuple = ipv4_nfattr_to_tuple,

#endif

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+2 −4
Original line number Diff line number Diff line
@@ -268,8 +268,7 @@ icmp_error(struct sk_buff *skb, unsigned int dataoff, 
	return icmp_error_message(skb, ctinfo, hooknum);

}



#if defined(CONFIG_NF_CT_NETLINK) || \

    defined(CONFIG_NF_CT_NETLINK_MODULE)

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



#include <linux/netfilter/nfnetlink.h>

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

	.destroy		= NULL,

	.me			= NULL,

#if defined(CONFIG_NF_CT_NETLINK) || \

    defined(CONFIG_NF_CT_NETLINK_MODULE)

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

	.tuple_to_nfattr	= icmp_tuple_to_nfattr,

	.nfattr_to_tuple	= icmp_nfattr_to_tuple,

#endif

net/ipv4/netfilter/nf_nat_core.c

+1 −2
Original line number Diff line number Diff line
@@ -546,8 +546,7 @@ void nf_nat_protocol_unregister(struct nf_nat_protocol *proto) 
}

EXPORT_SYMBOL(nf_nat_protocol_unregister);



#if defined(CONFIG_IP_NF_CONNTRACK_NETLINK) || \

    defined(CONFIG_IP_NF_CONNTRACK_NETLINK_MODULE)

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

int

nf_nat_port_range_to_nfattr(struct sk_buff *skb,

			    const struct nf_nat_range *range)

net/ipv4/netfilter/nf_nat_proto_gre.c

+1 −2
Original line number Diff line number Diff line
@@ -152,8 +152,7 @@ static struct nf_nat_protocol gre __read_mostly = { 
	.manip_pkt		= gre_manip_pkt,

	.in_range		= gre_in_range,

	.unique_tuple		= gre_unique_tuple,

#if defined(CONFIG_IP_NF_CONNTRACK_NETLINK) || \

    defined(CONFIG_IP_NF_CONNTRACK_NETLINK_MODULE)

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

	.range_to_nfattr	= nf_nat_port_range_to_nfattr,

	.nfattr_to_range	= nf_nat_port_nfattr_to_range,

#endif

net/ipv4/netfilter/nf_nat_proto_icmp.c

+1 −2
Original line number Diff line number Diff line
@@ -78,8 +78,7 @@ struct nf_nat_protocol nf_nat_protocol_icmp = { 
	.manip_pkt		= icmp_manip_pkt,

	.in_range		= icmp_in_range,

	.unique_tuple		= icmp_unique_tuple,

#if defined(CONFIG_IP_NF_CONNTRACK_NETLINK) || \

    defined(CONFIG_IP_NF_CONNTRACK_NETLINK_MODULE)

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

	.range_to_nfattr	= nf_nat_port_range_to_nfattr,

	.nfattr_to_range	= nf_nat_port_nfattr_to_range,

#endif