ipx: move Novell IPX protocol support into staging

The Netware IPX protocol is very old and no one should still be using it. It is time to move it into staging for a while and eventually decommision it. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hkittaka · Nov 28, 2017 · e02554e · e02554e
1 parent da1725c
commit e02554e
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 4 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -7311,9 +7311,8 @@ F:	drivers/tty/ipwireless/
 IPX NETWORK LAYER
 L:	netdev@vger.kernel.org
 S:	Odd fixes
-F:	include/net/ipx.h
 F:	include/uapi/linux/ipx.h
-F:	net/ipx/
+F:	drivers/staging/ipx/
 
 IRDA SUBSYSTEM
 M:	Samuel Ortiz <samuel@sortiz.org>

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
@@ -26,6 +26,8 @@ if STAGING
 
 source "drivers/staging/irda/net/Kconfig"
 
+source "drivers/staging/ipx/Kconfig"
+
 source "drivers/staging/wlan-ng/Kconfig"
 
 source "drivers/staging/comedi/Kconfig"

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
@@ -3,6 +3,7 @@
 
 obj-y				+= media/
 obj-y				+= typec/
+obj-$(CONFIG_IPX)		+= ipx/
 obj-$(CONFIG_IRDA)		+= irda/net/
 obj-$(CONFIG_IRDA)		+= irda/drivers/
 obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/

diff --git a/net/ipx/Kconfig → drivers/staging/ipx/Kconfig b/net/ipx/Kconfig → drivers/staging/ipx/Kconfig
diff --git a/net/ipx/Makefile → drivers/staging/ipx/Makefile b/net/ipx/Makefile → drivers/staging/ipx/Makefile
diff --git a/drivers/staging/ipx/TODO b/drivers/staging/ipx/TODO
@@ -0,0 +1,4 @@
+The ipx code will be removed soon from the kernel tree as it is old and
+obsolete and broken.
+
+Don't worry about fixing up anything here, it's not needed.
diff --git a/net/ipx/af_ipx.c → drivers/staging/ipx/af_ipx.c b/net/ipx/af_ipx.c → drivers/staging/ipx/af_ipx.c
diff --git a/net/ipx/ipx_proc.c → drivers/staging/ipx/ipx_proc.c b/net/ipx/ipx_proc.c → drivers/staging/ipx/ipx_proc.c
diff --git a/net/ipx/ipx_route.c → drivers/staging/ipx/ipx_route.c b/net/ipx/ipx_route.c → drivers/staging/ipx/ipx_route.c
diff --git a/net/ipx/pe2.c → drivers/staging/ipx/pe2.c b/net/ipx/pe2.c → drivers/staging/ipx/pe2.c
diff --git a/net/ipx/sysctl_net_ipx.c → drivers/staging/ipx/sysctl_net_ipx.c b/net/ipx/sysctl_net_ipx.c → drivers/staging/ipx/sysctl_net_ipx.c
diff --git a/net/Kconfig b/net/Kconfig
@@ -212,7 +212,6 @@ source "net/dsa/Kconfig"
 source "net/8021q/Kconfig"
 source "net/decnet/Kconfig"
 source "net/llc/Kconfig"
-source "net/ipx/Kconfig"
 source "drivers/net/appletalk/Kconfig"
 source "net/x25/Kconfig"
 source "net/lapb/Kconfig"

diff --git a/net/Makefile b/net/Makefile
@@ -24,7 +24,6 @@ obj-$(CONFIG_PACKET)		+= packet/
 obj-$(CONFIG_NET_KEY)		+= key/
 obj-$(CONFIG_BRIDGE)		+= bridge/
 obj-$(CONFIG_NET_DSA)		+= dsa/
-obj-$(CONFIG_IPX)		+= ipx/
 obj-$(CONFIG_ATALK)		+= appletalk/
 obj-$(CONFIG_X25)		+= x25/
 obj-$(CONFIG_LAPB)		+= lapb/