aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-04-19 09:45:29 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-20 21:22:30 -0400
commita5347fe36b313c07d59b065d00a8fa56362c5f97 (patch)
tree8778711b514baca6f5686777c0dea245a8874711 /net
parentec8f23ce0f4005b74013d4d122e0d540397a93c9 (diff)
net: Delete all remaining instances of ctl_path
We don't use struct ctl_path anymore so delete the exported constants. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Acked-by: Pavel Emelyanov <xemul@parallels.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/sysctl_net_core.c6
-rw-r--r--net/ipv4/netfilter.c10
-rw-r--r--net/ipv4/sysctl_net_ipv4.c7
-rw-r--r--net/ipv6/sysctl_net_ipv6.c7
-rw-r--r--net/netfilter/core.c9
-rw-r--r--net/netfilter/ipvs/ip_vs_ctl.c7
6 files changed, 0 insertions, 46 deletions
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 64924e345a9b..a7c36845b123 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -203,12 +203,6 @@ static struct ctl_table netns_core_table[] = {
203 { } 203 { }
204}; 204};
205 205
206__net_initdata struct ctl_path net_core_path[] = {
207 { .procname = "net", },
208 { .procname = "core", },
209 { },
210};
211
212static __net_init int sysctl_core_net_init(struct net *net) 206static __net_init int sysctl_core_net_init(struct net *net)
213{ 207{
214 struct ctl_table *tbl; 208 struct ctl_table *tbl;
diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
index 3cd8c586741a..ed1b36783192 100644
--- a/net/ipv4/netfilter.c
+++ b/net/ipv4/netfilter.c
@@ -237,13 +237,3 @@ static void ipv4_netfilter_fini(void)
237 237
238module_init(ipv4_netfilter_init); 238module_init(ipv4_netfilter_init);
239module_exit(ipv4_netfilter_fini); 239module_exit(ipv4_netfilter_fini);
240
241#ifdef CONFIG_SYSCTL
242struct ctl_path nf_net_ipv4_netfilter_sysctl_path[] = {
243 { .procname = "net", },
244 { .procname = "ipv4", },
245 { .procname = "netfilter", },
246 { }
247};
248EXPORT_SYMBOL_GPL(nf_net_ipv4_netfilter_sysctl_path);
249#endif /* CONFIG_SYSCTL */
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 56e64f7b75d0..33417f84e07f 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -768,13 +768,6 @@ static struct ctl_table ipv4_net_table[] = {
768 { } 768 { }
769}; 769};
770 770
771struct ctl_path net_ipv4_ctl_path[] = {
772 { .procname = "net", },
773 { .procname = "ipv4", },
774 { },
775};
776EXPORT_SYMBOL_GPL(net_ipv4_ctl_path);
777
778static __net_init int ipv4_sysctl_init_net(struct net *net) 771static __net_init int ipv4_sysctl_init_net(struct net *net)
779{ 772{
780 struct ctl_table *table; 773 struct ctl_table *table;
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index a52d8203a5de..e85c48bd404f 100644
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -38,13 +38,6 @@ static ctl_table ipv6_rotable[] = {
38 { } 38 { }
39}; 39};
40 40
41struct ctl_path net_ipv6_ctl_path[] = {
42 { .procname = "net", },
43 { .procname = "ipv6", },
44 { },
45};
46EXPORT_SYMBOL_GPL(net_ipv6_ctl_path);
47
48static int __net_init ipv6_sysctl_net_init(struct net *net) 41static int __net_init ipv6_sysctl_net_init(struct net *net)
49{ 42{
50 struct ctl_table *ipv6_table; 43 struct ctl_table *ipv6_table;
diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index e1b7e051332e..e19f3653db23 100644
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -290,12 +290,3 @@ void __init netfilter_init(void)
290 if (netfilter_log_init() < 0) 290 if (netfilter_log_init() < 0)
291 panic("cannot initialize nf_log"); 291 panic("cannot initialize nf_log");
292} 292}
293
294#ifdef CONFIG_SYSCTL
295struct ctl_path nf_net_netfilter_sysctl_path[] = {
296 { .procname = "net", },
297 { .procname = "netfilter", },
298 { }
299};
300EXPORT_SYMBOL_GPL(nf_net_netfilter_sysctl_path);
301#endif /* CONFIG_SYSCTL */
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index a606d6b1b0e5..e3707d2bd9c7 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -1846,13 +1846,6 @@ static struct ctl_table vs_vars[] = {
1846 { } 1846 { }
1847}; 1847};
1848 1848
1849const struct ctl_path net_vs_ctl_path[] = {
1850 { .procname = "net", },
1851 { .procname = "ipv4", },
1852 { .procname = "vs", },
1853 { }
1854};
1855EXPORT_SYMBOL_GPL(net_vs_ctl_path);
1856#endif 1849#endif
1857 1850
1858#ifdef CONFIG_PROC_FS 1851#ifdef CONFIG_PROC_FS