Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a786a7c0 authored by Paul Gortmaker's avatar Paul Gortmaker
Browse files

wanrouter: completely decouple obsolete code from kernel. 

The original suggestion to delete wanrouter started earlier
with the mainline commit f0d1b3c2
("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
7be6065b ("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



Originally-by: default avatarJoe Perches <joe@perches.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent 1b13c97f

Documentation/ioctl/ioctl-number.txt

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -356,60 +356,6 @@ config SDLA 
	  To compile this driver as a module, choose M here: the

	  module will be called sdla.



# Wan router core.

config WAN_ROUTER_DRIVERS

	tristate "WAN router drivers"

	depends on WAN_ROUTER

	---help---

	  Connect LAN to WAN via Linux box.



	  Select driver your card and remember to say Y to "Wan Router."

	  You will need the wan-tools package which is available from

	  <ftp://ftp.sangoma.com/>.



	  Note that the answer to this question won't directly affect the

	  kernel except for how subordinate drivers may be built:

	  saying N will just cause the configurator to skip all

	  the questions about WAN router drivers.



	  If unsure, say N.



config CYCLADES_SYNC

	tristate "Cyclom 2X(tm) cards (EXPERIMENTAL)"

	depends on WAN_ROUTER_DRIVERS && (PCI || ISA)

	---help---

	  Cyclom 2X from Cyclades Corporation <http://www.avocent.com/> is an

	  intelligent multiprotocol WAN adapter with data transfer rates up to

	  512 Kbps. These cards support the X.25 and SNA related protocols.



	  While no documentation is available at this time please grab the

	  wanconfig tarball in

	  <http://www.conectiva.com.br/~acme/cycsyn-devel/> (with minor changes

	  to make it compile with the current wanrouter include files; efforts

	  are being made to use the original package available at

	  <ftp://ftp.sangoma.com/>).



	  Feel free to contact me or the cycsyn-devel mailing list at

	  <acme@conectiva.com.br> and <cycsyn-devel@bazar.conectiva.com.br> for

	  additional details, I hope to have documentation available as soon as

	  possible. (Cyclades Brazil is writing the Documentation).



	  The next questions will ask you about the protocols you want the

	  driver to support (for now only X.25 is supported).



	  If you have one or more of these cards, say Y to this option.



	  To compile this driver as a module, choose M here: the

	  module will be called cyclomx.



config CYCLOMX_X25

	bool "Cyclom 2X X.25 support (EXPERIMENTAL)"

	depends on CYCLADES_SYNC

	help

	  Connect a Cyclom 2X card to an X.25 network.



	  Enabling X.25 support will enlarge your kernel by about 11 kB.



# X.25 network drivers

config LAPBETHER

	tristate "LAPB over Ethernet driver (EXPERIMENTAL)"