| Submitter | Simon Horman |
|---|---|
| Date | Sept. 25, 2011, 12:49 a.m. |
| Message ID | <1316911743-28269-1-git-send-email-horms@verge.net.au> |
| Download | mbox | patch |
| Permalink | /patch/116263/ |
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
Comments
Hello, On Sun, 25 Sep 2011, Simon Horman wrote: > This does not appear to be used anywhere. > > Signed-off-by: Simon Horman <horms@verge.net.au> > --- > net/netfilter/ipvs/ip_vs_ctl.c | 11 ----------- > 1 files changed, 0 insertions(+), 11 deletions(-) > > Julian, I cant see any users of this sysctl in the current code. > Am I missing something? It is used, see ip_vs_conntrack_enabled() in include/net/ip_vs.h, after the netns changes the var is named sysctl_conntrack. > diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c > index 36f4495..49befca 100644 > --- a/net/netfilter/ipvs/ip_vs_ctl.c > +++ b/net/netfilter/ipvs/ip_vs_ctl.c > @@ -1605,14 +1605,6 @@ static struct ctl_table vs_vars[] = { > .mode = 0644, > .proc_handler = proc_do_defense_mode, > }, > -#ifdef CONFIG_IP_VS_NFCT > - { > - .procname = "conntrack", > - .maxlen = sizeof(int), > - .mode = 0644, > - .proc_handler = &proc_dointvec, > - }, > -#endif > { > .procname = "secure_tcp", > .maxlen = sizeof(int), > @@ -3535,9 +3527,6 @@ int __net_init __ip_vs_control_init_sysctl(struct net *net) > tbl[idx++].data = &ipvs->sysctl_am_droprate; > tbl[idx++].data = &ipvs->sysctl_drop_entry; > tbl[idx++].data = &ipvs->sysctl_drop_packet; > -#ifdef CONFIG_IP_VS_NFCT > - tbl[idx++].data = &ipvs->sysctl_conntrack; > -#endif > tbl[idx++].data = &ipvs->sysctl_secure_tcp; > ipvs->sysctl_snat_reroute = 1; > tbl[idx++].data = &ipvs->sysctl_snat_reroute; > -- > 1.7.5.4 Regards -- Julian Anastasov <ja@ssi.bg> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Patch
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 36f4495..49befca 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -1605,14 +1605,6 @@ static struct ctl_table vs_vars[] = { .mode = 0644, .proc_handler = proc_do_defense_mode, }, -#ifdef CONFIG_IP_VS_NFCT - { - .procname = "conntrack", - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = &proc_dointvec, - }, -#endif { .procname = "secure_tcp", .maxlen = sizeof(int), @@ -3535,9 +3527,6 @@ int __net_init __ip_vs_control_init_sysctl(struct net *net) tbl[idx++].data = &ipvs->sysctl_am_droprate; tbl[idx++].data = &ipvs->sysctl_drop_entry; tbl[idx++].data = &ipvs->sysctl_drop_packet; -#ifdef CONFIG_IP_VS_NFCT - tbl[idx++].data = &ipvs->sysctl_conntrack; -#endif tbl[idx++].data = &ipvs->sysctl_secure_tcp; ipvs->sysctl_snat_reroute = 1; tbl[idx++].data = &ipvs->sysctl_snat_reroute;
This does not appear to be used anywhere. Signed-off-by: Simon Horman <horms@verge.net.au> --- net/netfilter/ipvs/ip_vs_ctl.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) Julian, I cant see any users of this sysctl in the current code. Am I missing something?