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: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user