浏览代码

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>
Stephen Hemminger 7 年之前
父节点
当前提交
e02554e9a4

+ 1 - 2
MAINTAINERS

@@ -7311,9 +7311,8 @@ F:	drivers/tty/ipwireless/
 IPX NETWORK LAYER
 IPX NETWORK LAYER
 L:	netdev@vger.kernel.org
 L:	netdev@vger.kernel.org
 S:	Odd fixes
 S:	Odd fixes
-F:	include/net/ipx.h
 F:	include/uapi/linux/ipx.h
 F:	include/uapi/linux/ipx.h
-F:	net/ipx/
+F:	drivers/staging/ipx/
 
 
 IRDA SUBSYSTEM
 IRDA SUBSYSTEM
 M:	Samuel Ortiz <samuel@sortiz.org>
 M:	Samuel Ortiz <samuel@sortiz.org>

+ 2 - 0
drivers/staging/Kconfig

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

+ 1 - 0
drivers/staging/Makefile

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

+ 0 - 0
net/ipx/Kconfig → drivers/staging/ipx/Kconfig


+ 0 - 0
net/ipx/Makefile → drivers/staging/ipx/Makefile


+ 4 - 0
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.

+ 0 - 0
net/ipx/af_ipx.c → drivers/staging/ipx/af_ipx.c


+ 0 - 0
net/ipx/ipx_proc.c → drivers/staging/ipx/ipx_proc.c


+ 0 - 0
net/ipx/ipx_route.c → drivers/staging/ipx/ipx_route.c


+ 0 - 0
net/ipx/pe2.c → drivers/staging/ipx/pe2.c


+ 0 - 0
net/ipx/sysctl_net_ipx.c → drivers/staging/ipx/sysctl_net_ipx.c


+ 0 - 1
net/Kconfig

@@ -212,7 +212,6 @@ source "net/dsa/Kconfig"
 source "net/8021q/Kconfig"
 source "net/8021q/Kconfig"
 source "net/decnet/Kconfig"
 source "net/decnet/Kconfig"
 source "net/llc/Kconfig"
 source "net/llc/Kconfig"
-source "net/ipx/Kconfig"
 source "drivers/net/appletalk/Kconfig"
 source "drivers/net/appletalk/Kconfig"
 source "net/x25/Kconfig"
 source "net/x25/Kconfig"
 source "net/lapb/Kconfig"
 source "net/lapb/Kconfig"

+ 0 - 1
net/Makefile

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