Skip to contentSkip to conversation

retire IPX and NCPFS

PATCH In review Stephen Hemminger 3 participants 7 messages Nov 14, 2017 – Nov 15, 2017

Subsystems (4)
Networking Network drivers VFS Staging
lore
Share & tools
lore

Stephen Hemminger

author
#0 lore raw

v2 cover retire IPX and NCPFS

These are both old decrepit protocols that need to be sent to pasture.

Stephen Hemminger (2):
ipx: move Novell IPX protocol support into staging
ncpfs: move net/ncpfs to drivers/staging/ncpfs

 MAINTAINERS                                    | 5 ++---
 drivers/staging/Kconfig                        | 4 ++++
 drivers/staging/Makefile                       | 2 ++
 {net => drivers/staging}/ipx/Kconfig           | 0
 {net => drivers/staging}/ipx/Makefile          | 0
 drivers/staging/ipx/TODO                       | 4 ++++
 {net => drivers/staging}/ipx/af_ipx.c          | 0
 {net => drivers/staging}/ipx/ipx_proc.c        | 0
 {net => drivers/staging}/ipx/ipx_route.c       | 0
 {net => drivers/staging}/ipx/pe2.c             | 0
 {net => drivers/staging}/ipx/sysctl_net_ipx.c  | 0
 {fs => drivers/staging}/ncpfs/Kconfig          | 0
 {fs => drivers/staging}/ncpfs/Makefile         | 0
 drivers/staging/ncpfs/TODO                     | 4 ++++
 {fs => drivers/staging}/ncpfs/dir.c            | 0
 {fs => drivers/staging}/ncpfs/file.c           | 0
 {fs => drivers/staging}/ncpfs/getopt.c         | 0
 {fs => drivers/staging}/ncpfs/getopt.h         | 0
 {fs => drivers/staging}/ncpfs/inode.c          | 0
 {fs => drivers/staging}/ncpfs/ioctl.c          | 0
 {fs => drivers/staging}/ncpfs/mmap.c           | 0
 {fs => drivers/staging}/ncpfs/ncp_fs.h         | 0
 {fs => drivers/staging}/ncpfs/ncp_fs_i.h       | 0
 {fs => drivers/staging}/ncpfs/ncp_fs_sb.h      | 0
 {fs => drivers/staging}/ncpfs/ncplib_kernel.c  | 0
 {fs => drivers/staging}/ncpfs/ncplib_kernel.h  | 0
 {fs => drivers/staging}/ncpfs/ncpsign_kernel.c | 0
 {fs => drivers/staging}/ncpfs/ncpsign_kernel.h | 0
 {fs => drivers/staging}/ncpfs/sock.c           | 0
 {fs => drivers/staging}/ncpfs/symlink.c        | 0
 fs/Kconfig                                     | 1 -
 fs/Makefile                                    | 1 -
 net/Kconfig                                    | 1 -
 net/Makefile                                   | 1 -
 34 files changed, 16 insertions(+), 7 deletions(-)
 rename {net => drivers/staging}/ipx/Kconfig (100%)
 rename {net => drivers/staging}/ipx/Makefile (100%)
 create mode 100644 drivers/staging/ipx/TODO
 rename {net => drivers/staging}/ipx/af_ipx.c (100%)
 rename {net => drivers/staging}/ipx/ipx_proc.c (100%)
 rename {net => drivers/staging}/ipx/ipx_route.c (100%)
 rename {net => drivers/staging}/ipx/pe2.c (100%)
 rename {net => drivers/staging}/ipx/sysctl_net_ipx.c (100%)
 rename {fs => drivers/staging}/ncpfs/Kconfig (100%)
 rename {fs => drivers/staging}/ncpfs/Makefile (100%)
 create mode 100644 drivers/staging/ncpfs/TODO
 rename {fs => drivers/staging}/ncpfs/dir.c (100%)
 rename {fs => drivers/staging}/ncpfs/file.c (100%)
 rename {fs => drivers/staging}/ncpfs/getopt.c (100%)
 rename {fs => drivers/staging}/ncpfs/getopt.h (100%)
 rename {fs => drivers/staging}/ncpfs/inode.c (100%)
 rename {fs => drivers/staging}/ncpfs/ioctl.c (100%)
 rename {fs => drivers/staging}/ncpfs/mmap.c (100%)
 rename {fs => drivers/staging}/ncpfs/ncp_fs.h (100%)
 rename {fs => drivers/staging}/ncpfs/ncp_fs_i.h (100%)
 rename {fs => drivers/staging}/ncpfs/ncp_fs_sb.h (100%)
 rename {fs => drivers/staging}/ncpfs/ncplib_kernel.c (100%)
 rename {fs => drivers/staging}/ncpfs/ncplib_kernel.h (100%)
 rename {fs => drivers/staging}/ncpfs/ncpsign_kernel.c (100%)
 rename {fs => drivers/staging}/ncpfs/ncpsign_kernel.h (100%)
 rename {fs => drivers/staging}/ncpfs/sock.c (100%)
 rename {fs => drivers/staging}/ncpfs/symlink.c (100%)
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH v2 1/2 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 <[email protected]>

---
v2 add a TODO (don't touch me) file

 MAINTAINERS                                   | 3 +--
 drivers/staging/Kconfig                       | 2 ++
 drivers/staging/Makefile                      | 1 +
 {net => drivers/staging}/ipx/Kconfig          | 0
 {net => drivers/staging}/ipx/Makefile         | 0
 drivers/staging/ipx/TODO                      | 4 ++++
 {net => drivers/staging}/ipx/af_ipx.c         | 0
 {net => drivers/staging}/ipx/ipx_proc.c       | 0
 {net => drivers/staging}/ipx/ipx_route.c      | 0
 {net => drivers/staging}/ipx/pe2.c            | 0
 {net => drivers/staging}/ipx/sysctl_net_ipx.c | 0
 net/Kconfig                                   | 1 -
 net/Makefile                                  | 1 -
 13 files changed, 8 insertions(+), 4 deletions(-)
 rename {net => drivers/staging}/ipx/Kconfig (100%)
 rename {net => drivers/staging}/ipx/Makefile (100%)
 create mode 100644 drivers/staging/ipx/TODO
 rename {net => drivers/staging}/ipx/af_ipx.c (100%)
 rename {net => drivers/staging}/ipx/ipx_proc.c (100%)
 rename {net => drivers/staging}/ipx/ipx_route.c (100%)
 rename {net => drivers/staging}/ipx/pe2.c (100%)
 rename {net => drivers/staging}/ipx/sysctl_net_ipx.c (100%)
MAINTAINERS +1 -2
index 29aa89a1837b..54c29ebcec55 100644
@@ -7206,9 +7206,8 @@ F:	drivers/tty/ipwireless/
 IPX NETWORK LAYER
 L:	[email protected]
 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 <[email protected]>
drivers/staging/Kconfig +2 -0
index 554683912cff..3744640bed5a 100644
@@ -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"
drivers/staging/Makefile +1 -0
index 6e536020029a..f4c0506470ff 100644
@@ -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/
drivers/staging/ipx/Kconfig renamed from net/ipx/Kconfig +0 -0
similarity index 100%
rename from net/ipx/Kconfig
rename to drivers/staging/ipx/Kconfig
drivers/staging/ipx/Makefile renamed from net/ipx/Makefile +0 -0
similarity index 100%
rename from net/ipx/Makefile
rename to drivers/staging/ipx/Makefile
drivers/staging/ipx/TODO new file +4 -0
new file mode 100644
index 000000000000..80db5d968264
@@ -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.
drivers/staging/ipx/af_ipx.c renamed from net/ipx/af_ipx.c +0 -0
similarity index 100%
rename from net/ipx/af_ipx.c
rename to drivers/staging/ipx/af_ipx.c
drivers/staging/ipx/ipx_proc.c renamed from net/ipx/ipx_proc.c +0 -0
similarity index 100%
rename from net/ipx/ipx_proc.c
rename to drivers/staging/ipx/ipx_proc.c
drivers/staging/ipx/ipx_route.c renamed from net/ipx/ipx_route.c +0 -0
similarity index 100%
rename from net/ipx/ipx_route.c
rename to drivers/staging/ipx/ipx_route.c
drivers/staging/ipx/pe2.c renamed from net/ipx/pe2.c +0 -0
similarity index 100%
rename from net/ipx/pe2.c
rename to drivers/staging/ipx/pe2.c
drivers/staging/ipx/sysctl_net_ipx.c renamed from net/ipx/sysctl_net_ipx.c +0 -0
similarity index 100%
rename from net/ipx/sysctl_net_ipx.c
rename to drivers/staging/ipx/sysctl_net_ipx.c
net/Kconfig +0 -1
index 9dba2715919d..ff71ba0f6c27 100644
@@ -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"
net/Makefile +0 -1
index 14fede520840..a6147c61b174 100644
@@ -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/
Signature · 1 line
2.11.0
author
#2 lore raw

PATCH v2 2/2 ncpfs: move net/ncpfs to drivers/staging/ncpfs

In reply to Stephen Hemminger

The Netware Core Protocol is a file system that talks to Netware clients over IPX. Since IPX has been dead for many years move the file system into staging for eventual interment.

Signed-off-by Stephen Hemminger <[email protected]>

---
v2 add a TODO (don't touch me) file

 MAINTAINERS                                    | 2 +-
 drivers/staging/Kconfig                        | 2 ++
 drivers/staging/Makefile                       | 1 +
 {fs => drivers/staging}/ncpfs/Kconfig          | 0
 {fs => drivers/staging}/ncpfs/Makefile         | 0
 drivers/staging/ncpfs/TODO                     | 4 ++++
 {fs => drivers/staging}/ncpfs/dir.c            | 0
 {fs => drivers/staging}/ncpfs/file.c           | 0
 {fs => drivers/staging}/ncpfs/getopt.c         | 0
 {fs => drivers/staging}/ncpfs/getopt.h         | 0
 {fs => drivers/staging}/ncpfs/inode.c          | 0
 {fs => drivers/staging}/ncpfs/ioctl.c          | 0
 {fs => drivers/staging}/ncpfs/mmap.c           | 0
 {fs => drivers/staging}/ncpfs/ncp_fs.h         | 0
 {fs => drivers/staging}/ncpfs/ncp_fs_i.h       | 0
 {fs => drivers/staging}/ncpfs/ncp_fs_sb.h      | 0
 {fs => drivers/staging}/ncpfs/ncplib_kernel.c  | 0
 {fs => drivers/staging}/ncpfs/ncplib_kernel.h  | 0
 {fs => drivers/staging}/ncpfs/ncpsign_kernel.c | 0
 {fs => drivers/staging}/ncpfs/ncpsign_kernel.h | 0
 {fs => drivers/staging}/ncpfs/sock.c           | 0
 {fs => drivers/staging}/ncpfs/symlink.c        | 0
 fs/Kconfig                                     | 1 -
 fs/Makefile                                    | 1 -
 24 files changed, 8 insertions(+), 3 deletions(-)
 rename {fs => drivers/staging}/ncpfs/Kconfig (100%)
 rename {fs => drivers/staging}/ncpfs/Makefile (100%)
 create mode 100644 drivers/staging/ncpfs/TODO
 rename {fs => drivers/staging}/ncpfs/dir.c (100%)
 rename {fs => drivers/staging}/ncpfs/file.c (100%)
 rename {fs => drivers/staging}/ncpfs/getopt.c (100%)
 rename {fs => drivers/staging}/ncpfs/getopt.h (100%)
 rename {fs => drivers/staging}/ncpfs/inode.c (100%)
 rename {fs => drivers/staging}/ncpfs/ioctl.c (100%)
 rename {fs => drivers/staging}/ncpfs/mmap.c (100%)
 rename {fs => drivers/staging}/ncpfs/ncp_fs.h (100%)
 rename {fs => drivers/staging}/ncpfs/ncp_fs_i.h (100%)
 rename {fs => drivers/staging}/ncpfs/ncp_fs_sb.h (100%)
 rename {fs => drivers/staging}/ncpfs/ncplib_kernel.c (100%)
 rename {fs => drivers/staging}/ncpfs/ncplib_kernel.h (100%)
 rename {fs => drivers/staging}/ncpfs/ncpsign_kernel.c (100%)
 rename {fs => drivers/staging}/ncpfs/ncpsign_kernel.h (100%)
 rename {fs => drivers/staging}/ncpfs/sock.c (100%)
 rename {fs => drivers/staging}/ncpfs/symlink.c (100%)
MAINTAINERS +1 -1
index 54c29ebcec55..5ed623ad5717 100644
@@ -9276,7 +9276,7 @@ F:	drivers/net/ethernet/natsemi/natsemi.c
 NCP FILESYSTEM
 M:	Petr Vandrovec <[email protected]>
 S:	Odd Fixes
-F:	fs/ncpfs/
+F:	drivers/staging/ncpfs/
 
 NCR 5380 SCSI DRIVERS
 M:	Finn Thain <[email protected]>
drivers/staging/Kconfig +2 -0
index 3744640bed5a..e95ab683331e 100644
@@ -28,6 +28,8 @@ source "drivers/staging/irda/net/Kconfig"
 
 source "drivers/staging/ipx/Kconfig"
 
+source "drivers/staging/ncpfs/Kconfig"
+
 source "drivers/staging/wlan-ng/Kconfig"
 
 source "drivers/staging/comedi/Kconfig"
drivers/staging/Makefile +1 -0
index f4c0506470ff..af8cd6a3a1f6 100644
@@ -4,6 +4,7 @@
 obj-y				+= media/
 obj-y				+= typec/
 obj-$(CONFIG_IPX)		+= ipx/
+obj-$(CONFIG_NCP_FS)		+= ncpfs/
 obj-$(CONFIG_IRDA)		+= irda/net/
 obj-$(CONFIG_IRDA)		+= irda/drivers/
 obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/
drivers/staging/ncpfs/Kconfig renamed from fs/ncpfs/Kconfig +0 -0
similarity index 100%
rename from fs/ncpfs/Kconfig
rename to drivers/staging/ncpfs/Kconfig
drivers/staging/ncpfs/Makefile renamed from fs/ncpfs/Makefile +0 -0
similarity index 100%
rename from fs/ncpfs/Makefile
rename to drivers/staging/ncpfs/Makefile
drivers/staging/ncpfs/TODO new file +4 -0
new file mode 100644
index 000000000000..9b6d38b7e248
@@ -0,0 +1,4 @@
+The ncpfs 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.
drivers/staging/ncpfs/dir.c renamed from fs/ncpfs/dir.c +0 -0
similarity index 100%
rename from fs/ncpfs/dir.c
rename to drivers/staging/ncpfs/dir.c
drivers/staging/ncpfs/file.c renamed from fs/ncpfs/file.c +0 -0
similarity index 100%
rename from fs/ncpfs/file.c
rename to drivers/staging/ncpfs/file.c
drivers/staging/ncpfs/getopt.c renamed from fs/ncpfs/getopt.c +0 -0
similarity index 100%
rename from fs/ncpfs/getopt.c
rename to drivers/staging/ncpfs/getopt.c
drivers/staging/ncpfs/getopt.h renamed from fs/ncpfs/getopt.h +0 -0
similarity index 100%
rename from fs/ncpfs/getopt.h
rename to drivers/staging/ncpfs/getopt.h
drivers/staging/ncpfs/inode.c renamed from fs/ncpfs/inode.c +0 -0
similarity index 100%
rename from fs/ncpfs/inode.c
rename to drivers/staging/ncpfs/inode.c
drivers/staging/ncpfs/ioctl.c renamed from fs/ncpfs/ioctl.c +0 -0
similarity index 100%
rename from fs/ncpfs/ioctl.c
rename to drivers/staging/ncpfs/ioctl.c
drivers/staging/ncpfs/mmap.c renamed from fs/ncpfs/mmap.c +0 -0
similarity index 100%
rename from fs/ncpfs/mmap.c
rename to drivers/staging/ncpfs/mmap.c
drivers/staging/ncpfs/ncp_fs.h renamed from fs/ncpfs/ncp_fs.h +0 -0
similarity index 100%
rename from fs/ncpfs/ncp_fs.h
rename to drivers/staging/ncpfs/ncp_fs.h
drivers/staging/ncpfs/ncp_fs_i.h renamed from fs/ncpfs/ncp_fs_i.h +0 -0
similarity index 100%
rename from fs/ncpfs/ncp_fs_i.h
rename to drivers/staging/ncpfs/ncp_fs_i.h
drivers/staging/ncpfs/ncp_fs_sb.h renamed from fs/ncpfs/ncp_fs_sb.h +0 -0
similarity index 100%
rename from fs/ncpfs/ncp_fs_sb.h
rename to drivers/staging/ncpfs/ncp_fs_sb.h
drivers/staging/ncpfs/ncplib_kernel.c renamed from fs/ncpfs/ncplib_kernel.c +0 -0
similarity index 100%
rename from fs/ncpfs/ncplib_kernel.c
rename to drivers/staging/ncpfs/ncplib_kernel.c
drivers/staging/ncpfs/ncplib_kernel.h renamed from fs/ncpfs/ncplib_kernel.h +0 -0
similarity index 100%
rename from fs/ncpfs/ncplib_kernel.h
rename to drivers/staging/ncpfs/ncplib_kernel.h
drivers/staging/ncpfs/ncpsign_kernel.c renamed from fs/ncpfs/ncpsign_kernel.c +0 -0
similarity index 100%
rename from fs/ncpfs/ncpsign_kernel.c
rename to drivers/staging/ncpfs/ncpsign_kernel.c
drivers/staging/ncpfs/ncpsign_kernel.h renamed from fs/ncpfs/ncpsign_kernel.h +0 -0
similarity index 100%
rename from fs/ncpfs/ncpsign_kernel.h
rename to drivers/staging/ncpfs/ncpsign_kernel.h
drivers/staging/ncpfs/sock.c renamed from fs/ncpfs/sock.c +0 -0
similarity index 100%
rename from fs/ncpfs/sock.c
rename to drivers/staging/ncpfs/sock.c
drivers/staging/ncpfs/symlink.c renamed from fs/ncpfs/symlink.c +0 -0
similarity index 100%
rename from fs/ncpfs/symlink.c
rename to drivers/staging/ncpfs/symlink.c
fs/Kconfig +0 -1
index 7aee6d699fd6..eaf968bf9cfc 100644
@@ -298,7 +298,6 @@ config NFS_COMMON
 source "net/sunrpc/Kconfig"
 source "fs/ceph/Kconfig"
 source "fs/cifs/Kconfig"
-source "fs/ncpfs/Kconfig"
 source "fs/coda/Kconfig"
 source "fs/afs/Kconfig"
 source "fs/9p/Kconfig"
fs/Makefile +0 -1
index ef772f1eaff8..add789ea270a 100644
@@ -92,7 +92,6 @@ obj-$(CONFIG_LOCKD)		+= lockd/
 obj-$(CONFIG_NLS)		+= nls/
 obj-$(CONFIG_SYSV_FS)		+= sysv/
 obj-$(CONFIG_CIFS)		+= cifs/
-obj-$(CONFIG_NCP_FS)		+= ncpfs/
 obj-$(CONFIG_HPFS_FS)		+= hpfs/
 obj-$(CONFIG_NTFS_FS)		+= ntfs/
 obj-$(CONFIG_UFS_FS)		+= ufs/
Signature · 1 line
2.11.0
#4 lore raw
Quoted 7 lines · David Miller

From: Stephen Hemminger <[email protected]>
Date: Tue, 14 Nov 2017 08:37:13 -0800

Quoted 2 lines

These are both old decrepit protocols that need to be sent to pasture.

These need to go to gregkh and his staging/ tree, not net-next.

I'll gladly take them, as long as you have no objection and I can get an ack for them.

thanks,

greg k-h

maintainer Acked-by
#5 lore raw

From: Greg KH <[email protected]>
Date: Wed, 15 Nov 2017 10:13:18 +0100

Quoted 11 lines · David Miller
Quoted 7 lines

From: Stephen Hemminger <[email protected]>
Date: Tue, 14 Nov 2017 08:37:13 -0800

Quoted 2 lines

These are both old decrepit protocols that need to be sent to pasture.

These need to go to gregkh and his staging/ tree, not net-next.

I'll gladly take them, as long as you have no objection and I can get an ack for them.

No objection:

Acked-by David S. Miller <[email protected]>
author
#6 lore raw
In reply to David Miller
Quoted 7 lines · On Wed, 15 Nov 2017 09:58:33 +0900 (KST) David Miller <[email protected]>…

From: Stephen Hemminger <[email protected]>
Date: Tue, 14 Nov 2017 08:37:13 -0800

Quoted 2 lines

These are both old decrepit protocols that need to be sent to pasture.

These need to go to gregkh and his staging/ tree, not net-next.

Ok, just wanted to get acceptance from netdev for moving