aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2013-01-30 21:49:29 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2013-01-31 19:20:33 -0500
commita786a7c0ad44985548118fd2370c792c0da36891 (patch)
tree506d699d86f31aafe7c55a198458011983cf5ae6 /drivers/net
parent1b13c97fae9c61dc20db8e0d0a72a29df29ac377 (diff)
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 Originally-by: Joe Perches <joe@perches.com> Cc: Dan Carpenter <dan.carpenter@oracle.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wan/Kconfig54
-rw-r--r--drivers/net/wan/Makefile5
2 files changed, 0 insertions, 59 deletions
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index d58431e99f73..0c077b0f7a2b 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -356,60 +356,6 @@ config SDLA
356 To compile this driver as a module, choose M here: the 356 To compile this driver as a module, choose M here: the
357 module will be called sdla. 357 module will be called sdla.
358 358
359# Wan router core.
360config WAN_ROUTER_DRIVERS
361 tristate "WAN router drivers"
362 depends on WAN_ROUTER
363 ---help---
364 Connect LAN to WAN via Linux box.
365
366 Select driver your card and remember to say Y to "Wan Router."
367 You will need the wan-tools package which is available from
368 <ftp://ftp.sangoma.com/>.
369
370 Note that the answer to this question won't directly affect the
371 kernel except for how subordinate drivers may be built:
372 saying N will just cause the configurator to skip all
373 the questions about WAN router drivers.
374
375 If unsure, say N.
376
377config CYCLADES_SYNC
378 tristate "Cyclom 2X(tm) cards (EXPERIMENTAL)"
379 depends on WAN_ROUTER_DRIVERS && (PCI || ISA)
380 ---help---
381 Cyclom 2X from Cyclades Corporation <http://www.avocent.com/> is an
382 intelligent multiprotocol WAN adapter with data transfer rates up to
383 512 Kbps. These cards support the X.25 and SNA related protocols.
384
385 While no documentation is available at this time please grab the
386 wanconfig tarball in
387 <http://www.conectiva.com.br/~acme/cycsyn-devel/> (with minor changes
388 to make it compile with the current wanrouter include files; efforts
389 are being made to use the original package available at
390 <ftp://ftp.sangoma.com/>).
391
392 Feel free to contact me or the cycsyn-devel mailing list at
393 <acme@conectiva.com.br> and <cycsyn-devel@bazar.conectiva.com.br> for
394 additional details, I hope to have documentation available as soon as
395 possible. (Cyclades Brazil is writing the Documentation).
396
397 The next questions will ask you about the protocols you want the
398 driver to support (for now only X.25 is supported).
399
400 If you have one or more of these cards, say Y to this option.
401
402 To compile this driver as a module, choose M here: the
403 module will be called cyclomx.
404
405config CYCLOMX_X25
406 bool "Cyclom 2X X.25 support (EXPERIMENTAL)"
407 depends on CYCLADES_SYNC
408 help
409 Connect a Cyclom 2X card to an X.25 network.
410
411 Enabling X.25 support will enlarge your kernel by about 11 kB.
412
413# X.25 network drivers 359# X.25 network drivers
414config LAPBETHER 360config LAPBETHER
415 tristate "LAPB over Ethernet driver (EXPERIMENTAL)" 361 tristate "LAPB over Ethernet driver (EXPERIMENTAL)"
diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile
index df70248e2fda..c135ef47cbca 100644
--- a/drivers/net/wan/Makefile
+++ b/drivers/net/wan/Makefile
@@ -5,10 +5,6 @@
5# Rewritten to use lists instead of if-statements. 5# Rewritten to use lists instead of if-statements.
6# 6#
7 7
8cyclomx-y := cycx_main.o
9cyclomx-$(CONFIG_CYCLOMX_X25) += cycx_x25.o
10cyclomx-objs := $(cyclomx-y)
11
12obj-$(CONFIG_HDLC) += hdlc.o 8obj-$(CONFIG_HDLC) += hdlc.o
13obj-$(CONFIG_HDLC_RAW) += hdlc_raw.o 9obj-$(CONFIG_HDLC_RAW) += hdlc_raw.o
14obj-$(CONFIG_HDLC_RAW_ETH) += hdlc_raw_eth.o 10obj-$(CONFIG_HDLC_RAW_ETH) += hdlc_raw_eth.o
@@ -28,7 +24,6 @@ obj-$(CONFIG_LANMEDIA) += lmc/
28 24
29obj-$(CONFIG_DLCI) += dlci.o 25obj-$(CONFIG_DLCI) += dlci.o
30obj-$(CONFIG_SDLA) += sdla.o 26obj-$(CONFIG_SDLA) += sdla.o
31obj-$(CONFIG_CYCLADES_SYNC) += cycx_drv.o cyclomx.o
32obj-$(CONFIG_LAPBETHER) += lapbether.o 27obj-$(CONFIG_LAPBETHER) += lapbether.o
33obj-$(CONFIG_SBNI) += sbni.o 28obj-$(CONFIG_SBNI) += sbni.o
34obj-$(CONFIG_N2) += n2.o 29obj-$(CONFIG_N2) += n2.o