From 500933e7a9491c956d774ce1529c4f9bc7dfcec8 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 6 Feb 2013 04:16:13 +0000 Subject: [PATCH] net: Disable WAN_ROUTER A change in Linux 2.6.29 completely broke it (it would oops on load) but no-one reported this, therefore it has no users. It was removed upstream and will clearly not be supportable in Debian. svn path=/dists/sid/linux/; revision=19787 --- debian/config/alpha/config | 6 ------ debian/config/armel/config.iop32x | 5 ----- debian/config/armel/config.ixp4xx | 5 ----- debian/config/armel/config.kirkwood | 5 ----- debian/config/armel/config.mv78xx0 | 5 ----- debian/config/armel/config.orion5x | 5 ----- debian/config/armel/config.versatile | 5 ----- debian/config/config | 7 +++++-- debian/config/defines | 3 +++ debian/config/hppa/config | 5 ----- debian/config/ia64/config | 1 - debian/config/kernelarch-x86/config | 6 ------ debian/config/m68k/config | 5 ----- debian/config/mips/config.4kc-malta | 5 ----- debian/config/mips/config.5kc-malta | 5 ----- debian/config/mips/config.r4k-ip22 | 5 ----- debian/config/mips/config.sb1-bcm91250a | 5 ----- debian/config/mips/config.sb1a-bcm91480b | 5 ----- debian/config/mipsel/config.r5k-cobalt | 5 ----- debian/config/powerpc/config | 6 ------ debian/config/s390/config | 5 ----- debian/config/sparc/config | 5 ----- 22 files changed, 8 insertions(+), 101 deletions(-) diff --git a/debian/config/alpha/config b/debian/config/alpha/config index ad869b2df..52cbfbb78 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -771,7 +771,6 @@ CONFIG_DSCC4_PCI_RST=y CONFIG_DLCI=m CONFIG_DLCI_MAX=8 CONFIG_SDLA=m -CONFIG_CYCLADES_SYNC=m ## ## file: drivers/net/wireless/Kconfig @@ -1108,11 +1107,6 @@ CONFIG_IRNET=m ## CONFIG_LAPB=m -## -## file: net/wanrouter/Kconfig -## -CONFIG_WAN_ROUTER=m - ## ## file: sound/drivers/Kconfig ## diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x index 0e5892778..e0e596e82 100644 --- a/debian/config/armel/config.iop32x +++ b/debian/config/armel/config.iop32x @@ -629,11 +629,6 @@ CONFIG_IPX_INTERN=y ## # CONFIG_LAPB is not set -## -## file: net/wanrouter/Kconfig -## -# CONFIG_WAN_ROUTER is not set - ## ## file: sound/drivers/Kconfig ## diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index 36318fafe..e9eb99321 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -760,11 +760,6 @@ CONFIG_IPX_INTERN=y ## CONFIG_LAPB=m -## -## file: net/wanrouter/Kconfig -## -CONFIG_WAN_ROUTER=m - ## ## file: sound/drivers/Kconfig ## diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 0c4ff6d6f..f75566d5a 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -679,11 +679,6 @@ CONFIG_AX25=m CONFIG_NETROM=m CONFIG_ROSE=m -## -## file: net/wanrouter/Kconfig -## -CONFIG_WAN_ROUTER=m - ## ## file: sound/soc/Kconfig ## diff --git a/debian/config/armel/config.mv78xx0 b/debian/config/armel/config.mv78xx0 index a4cc888f6..279323775 100644 --- a/debian/config/armel/config.mv78xx0 +++ b/debian/config/armel/config.mv78xx0 @@ -593,8 +593,3 @@ CONFIG_AX25=m CONFIG_NETROM=m CONFIG_ROSE=m -## -## file: net/wanrouter/Kconfig -## -CONFIG_WAN_ROUTER=m - diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index 2442711e8..e55dcd44b 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -616,8 +616,3 @@ CONFIG_AX25=m CONFIG_NETROM=m CONFIG_ROSE=m -## -## file: net/wanrouter/Kconfig -## -CONFIG_WAN_ROUTER=m - diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile index 7dc88a505..830d2e53c 100644 --- a/debian/config/armel/config.versatile +++ b/debian/config/armel/config.versatile @@ -518,8 +518,3 @@ CONFIG_IPX_INTERN=y ## # CONFIG_LAPB is not set -## -## file: net/wanrouter/Kconfig -## -# CONFIG_WAN_ROUTER is not set - diff --git a/debian/config/config b/debian/config/config index da5878d59..10ab6eb5b 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2155,8 +2155,6 @@ CONFIG_HDLC_FR=m CONFIG_HDLC_PPP=m # CONFIG_HDLC_X25 is not set # CONFIG_PC300TOO is not set -CONFIG_WAN_ROUTER_DRIVERS=m -# CONFIG_CYCLOMX_X25 is not set ## ## file: drivers/net/wimax/i2400m/Kconfig @@ -4633,6 +4631,11 @@ CONFIG_TIPC_LOG=0 ## CONFIG_UNIX=y +## +## file: net/wanrouter/Kconfig +## +# CONFIG_WAN_ROUTER is not set + ## ## file: net/wimax/Kconfig ## diff --git a/debian/config/defines b/debian/config/defines index a3cfdfdf8..4960c72ba 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -27,6 +27,9 @@ ignore-changes: intel_agp_enabled intel_gmch_* intel_gtt_* +# wanrouter was totally broken + module:drivers/net/wan/cycx_drv + module:net/wanrouter/wanrouter [base] arches: diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 72ef81462..63d32ce7b 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -695,11 +695,6 @@ CONFIG_IP_PNP_BOOTP=y ## # CONFIG_LLC2 is not set -## -## file: net/wanrouter/Kconfig -## -# CONFIG_WAN_ROUTER is not set - ## ## file: sound/drivers/Kconfig ## diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 52fb1c4ea..87d58138e 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -551,7 +551,6 @@ CONFIG_DSCC4=m # CONFIG_DSCC4_PCI_RST is not set CONFIG_DLCI=m CONFIG_DLCI_MAX=8 -# CONFIG_CYCLADES_SYNC is not set ## ## file: drivers/net/wireless/Kconfig diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index c8faeecb2..9e9fc7db8 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1001,7 +1001,6 @@ CONFIG_DSCC4_PCISYNC=y CONFIG_DSCC4_PCI_RST=y CONFIG_DLCI=m CONFIG_DLCI_MAX=8 -CONFIG_CYCLADES_SYNC=m CONFIG_SBNI=m # CONFIG_SBNI_MULTILINE is not set @@ -1680,11 +1679,6 @@ CONFIG_IRNET=m ## CONFIG_LAPB=m -## -## file: net/wanrouter/Kconfig -## -CONFIG_WAN_ROUTER=m - ## ## file: sound/drivers/Kconfig ## diff --git a/debian/config/m68k/config b/debian/config/m68k/config index 2c8b5a1c6..f93ff40f8 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -295,11 +295,6 @@ CONFIG_SYSFS=y #. TODO # CONFIG_NET_SCHED is not set -## -## file: net/wanrouter/Kconfig -## -# CONFIG_WAN_ROUTER is not set - ## ## file: net/xfrm/Kconfig ## diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index 939cc6a88..b1b25bf36 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -1152,11 +1152,6 @@ CONFIG_LAPB=m ## # CONFIG_NETLABEL is not set -## -## file: net/wanrouter/Kconfig -## -CONFIG_WAN_ROUTER=m - ## ## file: sound/drivers/Kconfig ## diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 449788f49..441b71628 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1156,11 +1156,6 @@ CONFIG_LAPB=m ## # CONFIG_NETLABEL is not set -## -## file: net/wanrouter/Kconfig -## -CONFIG_WAN_ROUTER=m - ## ## file: sound/drivers/Kconfig ## diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index ac68a40e0..92d62f9d7 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -529,11 +529,6 @@ CONFIG_FLATMEM_MANUAL=y ## # CONFIG_LAPB is not set -## -## file: net/wanrouter/Kconfig -## -# CONFIG_WAN_ROUTER is not set - ## ## file: sound/drivers/Kconfig ## diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index d147c08ea..919d8f2b2 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -800,8 +800,3 @@ CONFIG_IP_PNP_BOOTP=y ## # CONFIG_LAPB is not set -## -## file: net/wanrouter/Kconfig -## -# CONFIG_WAN_ROUTER is not set - diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index fd8b09cfc..9f63c3149 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -806,8 +806,3 @@ CONFIG_IP_PNP_BOOTP=y ## # CONFIG_LAPB is not set -## -## file: net/wanrouter/Kconfig -## -# CONFIG_WAN_ROUTER is not set - diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index f4f058a23..8db8b9a98 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -758,11 +758,6 @@ CONFIG_ROSE=m ## # CONFIG_LAPB is not set -## -## file: net/wanrouter/Kconfig -## -# CONFIG_WAN_ROUTER is not set - ## ## file: sound/drivers/Kconfig ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 452f35d96..fd4f50d1e 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -638,7 +638,6 @@ CONFIG_DSCC4=m # CONFIG_DSCC4_PCI_RST is not set CONFIG_DLCI=m CONFIG_DLCI_MAX=8 -CONFIG_CYCLADES_SYNC=m ## ## file: drivers/net/wireless/Kconfig @@ -942,11 +941,6 @@ CONFIG_IRNET=m ## CONFIG_LAPB=m -## -## file: net/wanrouter/Kconfig -## -CONFIG_WAN_ROUTER=m - ## ## file: sound/aoa/Kconfig ## diff --git a/debian/config/s390/config b/debian/config/s390/config index f17e99d36..589f96d2d 100644 --- a/debian/config/s390/config +++ b/debian/config/s390/config @@ -192,8 +192,3 @@ CONFIG_AFIUCV=m ## # CONFIG_LLC2 is not set -## -## file: net/wanrouter/Kconfig -## -# CONFIG_WAN_ROUTER is not set - diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 9a8d84ab6..46437b1f0 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -604,11 +604,6 @@ CONFIG_IPX=m ## # CONFIG_LAPB is not set -## -## file: net/wanrouter/Kconfig -## -# CONFIG_WAN_ROUTER is not set - ## ## file: sound/drivers/Kconfig ##