Skip to contentSkip to conversation

Delete obsolete wanrouter support

PATCH In review Paul Gortmaker 3 participants 5 messages Feb 1, 2013 – Feb 3, 2013

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover Delete obsolete wanrouter support

The removal of wanrouter code was originally listed in the (now gone) feature removal file since May 2012, and an RFC of the deletion was posted[1] in late 2012. The overall concept was given an OK, but defconfig contamination, build failures, etc. meant that it didn't quite make it into mainline for 3.8.

Since that time, Dan discovered (via code audit) a runtime bug that proves nobody has been using this for over four years[2]. With that new information, I think it makes sense for someone to follow through on Joe's original RFC and get this done for the 3.9 release.

In addition to resolving the build failures of the RFC by keeping stub headers, this also splits the change into two parts, just like the token ring removal did. Part #1 decouples the mainline kernel from the expired subsystem, and part #2 does the large scale deletion of the subsystem content.

The advantage of the above, is that a "git blame" will never lead you to a 4000+ line deletion commit. The large scale deletion will never show up in a "git blame" and hence the same advantages that we get from the "--irreversible-delete" in the review stage of "git format-patch" are also embedded into the git history itself. This may seem like a moot point to some, but for those who spend a considerable amount of time data mining in the git history, this is probably worth doing.

I have done build tests of all[mod/yes]config for both the stage 1 (Makefile and Kconfig) and stage 2 (full driver delete) as a sanity check, and the issues with the previously posted RFC should be gone.

Speaking of "--irreversible-delete" -- these patches were created with that option, so if you want to use them locally, you are going to have to pull (location below) the content instead of doing a "git am" of the mailed out content.

[1] http://patchwork.ozlabs.org/patch/198794/
[2] http://www.spinics.net/lists/netdev/msg218670.html

Thanks,
Paul.

Cc Dan Carpenter <[email protected]>
Cc Joe Perches <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>

---

The following changes since commit 1b13c97fae9c61dc20db8e0d0a72a29df29ac377:

net/vxlan: Add ethtool drvinfo (2013-01-30 22:47:22 -0500)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux.git delete-wanrouter

for you to fetch changes up to 6fcdf4facb85e7d54ff6195378dd2ba8e0baccc4:

wanrouter: delete now orphaned header content, files/drivers (2013-01-31 19:56:35 -0500)

----------------------------------------------------------------
Paul Gortmaker (2):
wanrouter: completely decouple obsolete code from kernel.
wanrouter: delete now orphaned header content, files/drivers

 Documentation/ioctl/ioctl-number.txt |    2 +-
 Documentation/magic-number.txt       |    2 +-
 Documentation/zh_CN/magic-number.txt |    2 +-
 drivers/isdn/i4l/isdn_x25iface.h     |    1 -
 drivers/net/wan/Kconfig              |   54 --
 drivers/net/wan/Makefile             |    5 -
 drivers/net/wan/cycx_drv.c           |  569 ------------
 drivers/net/wan/cycx_main.c          |  346 --------
 drivers/net/wan/cycx_x25.c           | 1602 ----------------------------------
 include/linux/cyclomx.h              |   77 --
 include/linux/cycx_drv.h             |   64 --
 include/linux/wanrouter.h            |  127 +--
 include/uapi/linux/wanrouter.h       |  443 +---------
 net/Kconfig                          |    1 -
 net/Makefile                         |    1 -
 net/socket.c                         |    1 -
 net/wanrouter/Kconfig                |   27 -
 net/wanrouter/Makefile               |    7 -
 net/wanrouter/patchlevel             |    1 -
 net/wanrouter/wanmain.c              |  782 -----------------
 net/wanrouter/wanproc.c              |  380 --------
 21 files changed, 11 insertions(+), 4483 deletions(-)
 delete mode 100644 drivers/net/wan/cycx_drv.c
 delete mode 100644 drivers/net/wan/cycx_main.c
 delete mode 100644 drivers/net/wan/cycx_x25.c
 delete mode 100644 include/linux/cyclomx.h
 delete mode 100644 include/linux/cycx_drv.h
 delete mode 100644 net/wanrouter/Kconfig
 delete mode 100644 net/wanrouter/Makefile
 delete mode 100644 net/wanrouter/patchlevel
 delete mode 100644 net/wanrouter/wanmain.c
 delete mode 100644 net/wanrouter/wanproc.c
#1 lore raw

PATCH 1/2 wanrouter: completely decouple obsolete code from kernel.

The original suggestion to delete wanrouter started earlier with the mainline commit f0d1b3c2bcc5de8a17af5f2274f7fcde8292b5fc ("net/wanrouter: Deprecate and schedule for removal") in May 2012.

More importantly, Dan Carpenter found[1] that the driver had a fundamental breakage introduced back in 2008, with commit 7be6065b39c3 ("netdevice wanrouter: Convert directly reference of netdev->priv"). So we know with certainty that the code hasn't been used by anyone willing to at least take the effort to send an e-mail report of breakage for at least 4 years.

This commit does a decouple of the wanrouter subsystem, by going after the Makefile/Kconfig and similar files, so that these mainline files that we are keeping do not have the big wanrouter file/driver deletion commit tied into their history.

Once this commit is in place, we then can remove the obsolete cyclomx drivers and similar that have a dependency on CONFIG_WAN_ROUTER_DRIVERS.

[1] http://www.spinics.net/lists/netdev/msg218670.html

Cc Dan Carpenter <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
---
 Documentation/ioctl/ioctl-number.txt |  2 +-
 Documentation/magic-number.txt       |  2 +-
 Documentation/zh_CN/magic-number.txt |  2 +-
 drivers/isdn/i4l/isdn_x25iface.h     |  1 -
 drivers/net/wan/Kconfig              | 54 ------------------------------------
 drivers/net/wan/Makefile             |  5 ----
 net/Kconfig                          |  1 -
 net/Makefile                         |  1 -
 net/socket.c                         |  1 -
 9 files changed, 3 insertions(+), 66 deletions(-)
Documentation/ioctl/ioctl-number.txt +1 -1
index 2152b0e..3210540 100644
@@ -179,7 +179,7 @@ Code  Seq#(hex)	Include File		Comments
 'V'	C0	media/davinci/vpfe_capture.h	conflict!
 'V'	C0	media/si4713.h		conflict!
 'W'	00-1F	linux/watchdog.h	conflict!
-'W'	00-1F	linux/wanrouter.h	conflict!
+'W'	00-1F	linux/wanrouter.h	conflict!		(pre 3.9)
 'W'	00-3F	sound/asound.h		conflict!
 'X'	all	fs/xfs/xfs_fs.h		conflict!
 		and fs/xfs/linux-2.6/xfs_ioctl32.h
Documentation/magic-number.txt +1 -1
index 82761a3..76d80a6 100644
@@ -122,7 +122,7 @@ SLAB_C_MAGIC          0x4f17a36d  kmem_cache        mm/slab.c
 COW_MAGIC             0x4f4f4f4d  cow_header_v1     arch/um/drivers/ubd_user.c
 I810_CARD_MAGIC       0x5072696E  i810_card         sound/oss/i810_audio.c
 TRIDENT_CARD_MAGIC    0x5072696E  trident_card      sound/oss/trident.c
-ROUTER_MAGIC          0x524d4157  wan_device        include/linux/wanrouter.h
+ROUTER_MAGIC          0x524d4157  wan_device        [in wanrouter.h pre 3.9]
 SCC_MAGIC             0x52696368  gs_port           drivers/char/scc.h
 SAVEKMSG_MAGIC1       0x53415645  savekmsg          arch/*/amiga/config.c
 GDA_MAGIC             0x58464552  gda               arch/mips/include/asm/sn/gda.h
Documentation/zh_CN/magic-number.txt +1 -1
index 4263022..2ebe539 100644
@@ -122,7 +122,7 @@ SLAB_C_MAGIC          0x4f17a36d  kmem_cache        mm/slab.c
 COW_MAGIC             0x4f4f4f4d  cow_header_v1     arch/um/drivers/ubd_user.c
 I810_CARD_MAGIC       0x5072696E  i810_card         sound/oss/i810_audio.c
 TRIDENT_CARD_MAGIC    0x5072696E  trident_card      sound/oss/trident.c
-ROUTER_MAGIC          0x524d4157  wan_device        include/linux/wanrouter.h
+ROUTER_MAGIC          0x524d4157  wan_device        [in wanrouter.h pre 3.9]
 SCC_MAGIC             0x52696368  gs_port           drivers/char/scc.h
 SAVEKMSG_MAGIC1       0x53415645  savekmsg          arch/*/amiga/config.c
 GDA_MAGIC             0x58464552  gda               arch/mips/include/asm/sn/gda.h
drivers/isdn/i4l/isdn_x25iface.h +0 -1
index 0b26e3b..ca08e08 100644
@@ -19,7 +19,6 @@
 #endif
 
 #include <linux/skbuff.h>
-#include <linux/wanrouter.h>
 #include <linux/isdn.h>
 #include <linux/concap.h>
 
drivers/net/wan/Kconfig +0 -54

60 lines not on this page · raw message

drivers/net/wan/Makefile +0 -5
index df70248..c135ef4 100644
@@ -5,10 +5,6 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-cyclomx-y                       := cycx_main.o
-cyclomx-$(CONFIG_CYCLOMX_X25)	+= cycx_x25.o
-cyclomx-objs			:= $(cyclomx-y)  
-
 obj-$(CONFIG_HDLC)		+= hdlc.o
 obj-$(CONFIG_HDLC_RAW)		+= hdlc_raw.o
 obj-$(CONFIG_HDLC_RAW_ETH)	+= hdlc_raw_eth.o
@@ -28,7 +24,6 @@ obj-$(CONFIG_LANMEDIA)		+= lmc/
 
 obj-$(CONFIG_DLCI)		+= dlci.o 
 obj-$(CONFIG_SDLA)		+= sdla.o
-obj-$(CONFIG_CYCLADES_SYNC)	+= cycx_drv.o cyclomx.o
 obj-$(CONFIG_LAPBETHER)		+= lapbether.o
 obj-$(CONFIG_SBNI)		+= sbni.o
 obj-$(CONFIG_N2)		+= n2.o
net/Kconfig +0 -1
index 3cc5be0..c31348e 100644
@@ -209,7 +209,6 @@ source "net/ipx/Kconfig"
 source "drivers/net/appletalk/Kconfig"
 source "net/x25/Kconfig"
 source "net/lapb/Kconfig"
-source "net/wanrouter/Kconfig"
 source "net/phonet/Kconfig"
 source "net/ieee802154/Kconfig"
 source "net/mac802154/Kconfig"
net/Makefile +0 -1
index 4f4ee08..c5aa8b3 100644
@@ -26,7 +26,6 @@ obj-$(CONFIG_BRIDGE)		+= bridge/
 obj-$(CONFIG_NET_DSA)		+= dsa/
 obj-$(CONFIG_IPX)		+= ipx/
 obj-$(CONFIG_ATALK)		+= appletalk/
-obj-$(CONFIG_WAN_ROUTER)	+= wanrouter/
 obj-$(CONFIG_X25)		+= x25/
 obj-$(CONFIG_LAPB)		+= lapb/
 obj-$(CONFIG_NETROM)		+= netrom/
net/socket.c +0 -1
index 2ca51c7..5c4d82c 100644
@@ -69,7 +69,6 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/mutex.h>
-#include <linux/wanrouter.h>
 #include <linux/if_bridge.h>
 #include <linux/if_frad.h>
 #include <linux/if_vlan.h>
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 2/2 wanrouter: delete now orphaned header content, files/drivers

In reply to Paul Gortmaker

The wanrouter support was identified earlier as unused for years, and so the previous commit totally decoupled it from the kernel, leaving the related wanrouter files present, but totally inert.

Here we take the final step in that cleanup, by doing a wholesale removal of these files. The two step process is used so that the large deletion is decoupled from the git history of files that we still care about.

The drivers deleted here all were dependent on the Kconfig setting CONFIG_WAN_ROUTER_DRIVERS.

A stub wanrouter.h header (kernel & uapi) are left behind so that drivers/isdn/i4l/isdn_x25iface.c continues to compile, and so that we don't accidentally break userspace that expected these defines.

Cc Joe Perches <[email protected]>
Cc Dan Carpenter <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
---
 drivers/net/wan/cycx_drv.c     |  569 --------------
 drivers/net/wan/cycx_main.c    |  346 ---------
 drivers/net/wan/cycx_x25.c     | 1602 ----------------------------------------
 include/linux/cyclomx.h        |   77 --
 include/linux/cycx_drv.h       |   64 --
 include/linux/wanrouter.h      |  127 +---
 include/uapi/linux/wanrouter.h |  443 +----------
 net/wanrouter/Kconfig          |   27 -
 net/wanrouter/Makefile         |    7 -
 net/wanrouter/patchlevel       |    1 -
 net/wanrouter/wanmain.c        |  782 --------------------
 net/wanrouter/wanproc.c        |  380 ----------
 12 files changed, 8 insertions(+), 4417 deletions(-)
 delete mode 100644 drivers/net/wan/cycx_drv.c
 delete mode 100644 drivers/net/wan/cycx_main.c
 delete mode 100644 drivers/net/wan/cycx_x25.c
 delete mode 100644 include/linux/cyclomx.h
 delete mode 100644 include/linux/cycx_drv.h
 delete mode 100644 net/wanrouter/Kconfig
 delete mode 100644 net/wanrouter/Makefile
 delete mode 100644 net/wanrouter/patchlevel
 delete mode 100644 net/wanrouter/wanmain.c
 delete mode 100644 net/wanrouter/wanproc.c
drivers/net/wan/cycx_drv.c deleted +0 -0
deleted file mode 100644
index 2a3ecae..0000000
drivers/net/wan/cycx_main.c deleted +0 -0
deleted file mode 100644
index 81fbbad..0000000
drivers/net/wan/cycx_x25.c deleted +0 -0
deleted file mode 100644
index 06f3f63..0000000
include/linux/cyclomx.h deleted +0 -0
deleted file mode 100644
index b88f7f4..0000000
include/linux/cycx_drv.h deleted +0 -0
deleted file mode 100644
index 12fe6b0..0000000
include/linux/wanrouter.h +4 -123

133 lines not on this page · raw message

include/uapi/linux/wanrouter.h +4 -439

455 lines not on this page · raw message

net/wanrouter/Kconfig deleted +0 -0
deleted file mode 100644
index a157a2e..0000000
net/wanrouter/Makefile deleted +0 -0
deleted file mode 100644
index 4da14bc..0000000
net/wanrouter/patchlevel deleted +0 -0
deleted file mode 100644
index c043eea..0000000
net/wanrouter/wanmain.c deleted +0 -0
deleted file mode 100644
index 2ab7850..0000000
net/wanrouter/wanproc.c deleted +0 -0
deleted file mode 100644
index c43612e..0000000
Signature · 1 line
1.8.1.2
#3 lore raw
In reply to Paul Gortmaker
Quoted 3 lines · Paul Gortmaker

The removal of wanrouter code was originally listed in the (now gone) feature removal file since May 2012, and an RFC of the deletion was posted[1] in late 2012.

[]

Quoted 5 lines

In addition to resolving the build failures of the RFC by keeping stub headers, this also splits the change into two parts, just like the token ring removal did. Part #1 decouples the mainline kernel from the expired subsystem, and part #2 does the large scale deletion of the subsystem content.

Thanks Paul.