X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fsysctl_net.c;h=b4f0525f91af08c4982b9e575b63527344b1c803;hb=2645a3c3761ac25498db2e627271016c849c68e1;hp=747fc55b28f1bbea7b2632fa85e216eb5cb6b8ef;hpb=33eb9cfc700ae9ce621d47d6ca6d6b4ad7cd97f3;p=linux-2.6

diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index 747fc55b28..b4f0525f91 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -30,26 +30,6 @@
 #include <linux/if_tr.h>
 #endif
 
-struct ctl_table net_table[] = {
-#ifdef CONFIG_INET
-	{
-		.ctl_name	= NET_IPV4,
-		.procname	= "ipv4",
-		.mode		= 0555,
-		.child		= ipv4_table
-	},
-#endif
-#ifdef CONFIG_TR
-	{
-		.ctl_name	= NET_TR,
-		.procname	= "token-ring",
-		.mode		= 0555,
-		.child		= tr_table,
-	},
-#endif
-	{ 0 },
-};
-
 static struct list_head *
 net_ctl_header_lookup(struct ctl_table_root *root, struct nsproxy *namespaces)
 {
@@ -102,6 +82,6 @@ EXPORT_SYMBOL_GPL(register_net_sysctl_table);
 
 void unregister_net_sysctl_table(struct ctl_table_header *header)
 {
-	return unregister_sysctl_table(header);
+	unregister_sysctl_table(header);
 }
 EXPORT_SYMBOL_GPL(unregister_net_sysctl_table);