aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/net.h1
-rw-r--r--kernel/sysctl.c8
-rw-r--r--net/sysctl_net.c4
3 files changed, 0 insertions, 13 deletions
diff --git a/include/linux/net.h b/include/linux/net.h
index f95f12c5840c..c414d90e647b 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -337,7 +337,6 @@ static const struct proto_ops name##_ops = { \
337 337
338#ifdef CONFIG_SYSCTL 338#ifdef CONFIG_SYSCTL
339#include <linux/sysctl.h> 339#include <linux/sysctl.h>
340extern ctl_table net_table[];
341extern int net_msg_cost; 340extern int net_msg_cost;
342extern int net_msg_burst; 341extern int net_msg_burst;
343#endif 342#endif
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 45e76f209dcb..4bc8e48434a7 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -200,14 +200,6 @@ static struct ctl_table root_table[] = {
200 .mode = 0555, 200 .mode = 0555,
201 .child = vm_table, 201 .child = vm_table,
202 }, 202 },
203#ifdef CONFIG_NET
204 {
205 .ctl_name = CTL_NET,
206 .procname = "net",
207 .mode = 0555,
208 .child = net_table,
209 },
210#endif
211 { 203 {
212 .ctl_name = CTL_FS, 204 .ctl_name = CTL_FS,
213 .procname = "fs", 205 .procname = "fs",
diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index 16ad14b5d572..665e856675a4 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -30,10 +30,6 @@
30#include <linux/if_tr.h> 30#include <linux/if_tr.h>
31#endif 31#endif
32 32
33struct ctl_table net_table[] = {
34 { 0 },
35};
36
37static struct list_head * 33static struct list_head *
38net_ctl_header_lookup(struct ctl_table_root *root, struct nsproxy *namespaces) 34net_ctl_header_lookup(struct ctl_table_root *root, struct nsproxy *namespaces)
39{ 35{