diff options
author | Stephen Hemminger <stephen@networkplumber.org> | 2017-11-14 08:37:14 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-28 13:55:00 +0100 |
commit | e02554e9a4338c58e75fdfb0ef908a5adc86cba5 (patch) | |
tree | c9b2029a35a8ee2583b8ba9c6df783b72c14ae44 | |
parent | da1725ca4869461890d5fd1be5202ff691c05f78 (diff) | |
download | op-kernel-dev-e02554e9a4338c58e75fdfb0ef908a5adc86cba5.zip op-kernel-dev-e02554e9a4338c58e75fdfb0ef908a5adc86cba5.tar.gz |
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>
-rw-r--r-- | MAINTAINERS | 3 | ||||
-rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/ipx/Kconfig (renamed from net/ipx/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/staging/ipx/Makefile (renamed from net/ipx/Makefile) | 0 | ||||
-rw-r--r-- | drivers/staging/ipx/TODO | 4 | ||||
-rw-r--r-- | drivers/staging/ipx/af_ipx.c (renamed from net/ipx/af_ipx.c) | 0 | ||||
-rw-r--r-- | drivers/staging/ipx/ipx_proc.c (renamed from net/ipx/ipx_proc.c) | 0 | ||||
-rw-r--r-- | drivers/staging/ipx/ipx_route.c (renamed from net/ipx/ipx_route.c) | 0 | ||||
-rw-r--r-- | drivers/staging/ipx/pe2.c (renamed from net/ipx/pe2.c) | 0 | ||||
-rw-r--r-- | drivers/staging/ipx/sysctl_net_ipx.c (renamed from net/ipx/sysctl_net_ipx.c) | 0 | ||||
-rw-r--r-- | net/Kconfig | 1 | ||||
-rw-r--r-- | net/Makefile | 1 |
13 files changed, 8 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index aa71ab52f..56cc726 100644 --- 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 index 5546839..3744640 100644 --- 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 index 6e53602..f4c0506 100644 --- 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 b/drivers/staging/ipx/Kconfig index e9ad006..e9ad006 100644 --- a/net/ipx/Kconfig +++ b/drivers/staging/ipx/Kconfig diff --git a/net/ipx/Makefile b/drivers/staging/ipx/Makefile index 440fafa..440fafa 100644 --- a/net/ipx/Makefile +++ b/drivers/staging/ipx/Makefile diff --git a/drivers/staging/ipx/TODO b/drivers/staging/ipx/TODO new file mode 100644 index 0000000..80db5d9 --- /dev/null +++ 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 b/drivers/staging/ipx/af_ipx.c index d21a9d1..d21a9d1 100644 --- a/net/ipx/af_ipx.c +++ b/drivers/staging/ipx/af_ipx.c diff --git a/net/ipx/ipx_proc.c b/drivers/staging/ipx/ipx_proc.c index 38a3d51..38a3d51 100644 --- a/net/ipx/ipx_proc.c +++ b/drivers/staging/ipx/ipx_proc.c diff --git a/net/ipx/ipx_route.c b/drivers/staging/ipx/ipx_route.c index 3cf93aa9..3cf93aa9 100644 --- a/net/ipx/ipx_route.c +++ b/drivers/staging/ipx/ipx_route.c diff --git a/net/ipx/pe2.c b/drivers/staging/ipx/pe2.c index ba7d421..ba7d421 100644 --- a/net/ipx/pe2.c +++ b/drivers/staging/ipx/pe2.c diff --git a/net/ipx/sysctl_net_ipx.c b/drivers/staging/ipx/sysctl_net_ipx.c index c3eef45..c3eef45 100644 --- a/net/ipx/sysctl_net_ipx.c +++ b/drivers/staging/ipx/sysctl_net_ipx.c diff --git a/net/Kconfig b/net/Kconfig index 9dba271..ff71ba0 100644 --- 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 index 14fede5..a6147c6 100644 --- 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/ |