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

Commit e76d0af5 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nf_conntrack: remove now unused sysctl for nf_conntrack_l[3|4]proto 



Since the sysctl data for l[3|4]proto now resides in pernet nf_proto_net.
We can now remove this unused fields from struct nf_contrack_l[3,4]proto.

Acked-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarGao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 4f71d80f

include/net/netfilter/nf_conntrack_l3proto.h

+0 −2
Original line number Diff line number Diff line
@@ -64,9 +64,7 @@ struct nf_conntrack_l3proto { 
	size_t nla_size;



#ifdef CONFIG_SYSCTL

	struct ctl_table_header	*ctl_table_header;

	const char		*ctl_table_path;

	struct ctl_table	*ctl_table;

#endif /* CONFIG_SYSCTL */



	/* Init l3proto pernet data */

include/net/netfilter/nf_conntrack_l4proto.h

+0 −10
Original line number Diff line number Diff line
@@ -93,16 +93,6 @@ struct nf_conntrack_l4proto { 
		unsigned int nlattr_max;

		const struct nla_policy *nla_policy;

	} ctnl_timeout;

#endif



#ifdef CONFIG_SYSCTL

	struct ctl_table_header	**ctl_table_header;

	struct ctl_table	*ctl_table;

	unsigned int		*ctl_table_users;

#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT

	struct ctl_table_header	*ctl_compat_table_header;

	struct ctl_table	*ctl_compat_table;

#endif

#endif

	int	*net_id;

	/* Init l4proto pernet data */

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+0 −1
Original line number Diff line number Diff line
@@ -380,7 +380,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = { 
#endif

#if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)

	.ctl_table_path  = "net/ipv4/netfilter",

	.ctl_table	 = ip_ct_sysctl_table,

#endif

	.init_net	 = ipv4_init_net,

	.me		 = THIS_MODULE,

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+0 −8
Original line number Diff line number Diff line
@@ -313,7 +313,6 @@ icmp_timeout_nla_policy[CTA_TIMEOUT_ICMP_MAX+1] = { 
#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */



#ifdef CONFIG_SYSCTL

static struct ctl_table_header *icmp_sysctl_header;

static struct ctl_table icmp_sysctl_table[] = {

	{

		.procname	= "nf_conntrack_icmp_timeout",
@@ -393,12 +392,5 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly = 
		.nla_policy	= icmp_timeout_nla_policy,

	},

#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */

#ifdef CONFIG_SYSCTL

	.ctl_table_header	= &icmp_sysctl_header,

	.ctl_table		= icmp_sysctl_table,

#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT

	.ctl_compat_table	= icmp_compat_sysctl_table,

#endif

#endif

	.init_net		= icmp_init_net,

};

net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c

+0 −5
Original line number Diff line number Diff line
@@ -320,7 +320,6 @@ icmpv6_timeout_nla_policy[CTA_TIMEOUT_ICMPV6_MAX+1] = { 
#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */



#ifdef CONFIG_SYSCTL

static struct ctl_table_header *icmpv6_sysctl_header;

static struct ctl_table icmpv6_sysctl_table[] = {

	{

		.procname	= "nf_conntrack_icmpv6_timeout",
@@ -375,9 +374,5 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 __read_mostly = 
		.nla_policy	= icmpv6_timeout_nla_policy,

	},

#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */

#ifdef CONFIG_SYSCTL

	.ctl_table_header	= &icmpv6_sysctl_header,

	.ctl_table		= icmpv6_sysctl_table,

#endif

	.init_net		= icmpv6_init_net,

};