[NET]: Eliminate unused /proc/sys/net/ethernet

The /proc/sys/net/ethernet directory has been sitting empty for more than
10 years!  Time to eliminate it!

Signed-off-by: Jes Sorensen <jes@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ethernet/Makefile b/net/ethernet/Makefile
index 69b74a9a0fc3a3cb0908782fd77e14e3cc2a885e..7cef1d8ace2738145978eef5c1cbeae226656db0 100644 (file)
--- a/net/ethernet/Makefile
+++ b/net/ethernet/Makefile
@@ -3,6 +3,5 @@
 #
 
 obj-y                                  += eth.o
-obj-$(CONFIG_SYSCTL)                   += sysctl_net_ether.o
 obj-$(subst m,y,$(CONFIG_IPX))         += pe2.o
 obj-$(subst m,y,$(CONFIG_ATALK))       += pe2.o

diff --git a/net/ethernet/sysctl_net_ether.c b/net/ethernet/sysctl_net_ether.c
deleted file mode 100644 (file)
index 66b39fc..0000000
--- a/net/ethernet/sysctl_net_ether.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* -*- linux-c -*-
- * sysctl_net_ether.c: sysctl interface to net Ethernet subsystem.
- *
- * Begun April 1, 1996, Mike Shaver.
- * Added /proc/sys/net/ether directory entry (empty =) ). [MS]
- */
-
-#include <linux/mm.h>
-#include <linux/sysctl.h>
-#include <linux/if_ether.h>
-
-ctl_table ether_table[] = {
-       {0}
-};

diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index 55538f6b60ffc56648687f9f72fd7d0ebafe6af3..58a1b6b42dddba6c85c10330bacdb48f7438e4f4 100644 (file)
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -37,14 +37,6 @@ struct ctl_table net_table[] = {
                .mode           = 0555,
                .child          = core_table,
        },
-#ifdef CONFIG_NET
-       {
-               .ctl_name       = NET_ETHER,
-               .procname       = "ethernet",
-               .mode           = 0555,
-               .child          = ether_table,
-       },
-#endif
 #ifdef CONFIG_INET
        {
                .ctl_name       = NET_IPV4,