diff --git a/debian/changelog b/debian/changelog index edaa07297..c50319ccf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ linux-2.6 (2.6.36-1~experimental.2) UNRELEASED; urgency=low * Enable PM_ADVANCED_DEBUG (Closes: #603254) * Disable X.25 protocol and related drivers. This 10 year old experiment has stalled and is a source of security bugs. + * Disable Econet protocol. It is unmaintained upstream, probably broken, + and of historical interest only. -- maximilian attems Wed, 31 Oct 2010 13:23:11 +0200 diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 8fae88fb5..3e1deeda1 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -1038,13 +1038,6 @@ CONFIG_ROSE=m CONFIG_DECNET=m # CONFIG_DECNET_ROUTER is not set -## -## file: net/econet/Kconfig -## -CONFIG_ECONET=m -CONFIG_ECONET_AUNUDP=y -CONFIG_ECONET_NATIVE=y - ## ## file: net/ipx/Kconfig ## diff --git a/debian/config/armel/config b/debian/config/armel/config index 1d4e1fa08..11d4964b0 100644 --- a/debian/config/armel/config +++ b/debian/config/armel/config @@ -81,12 +81,6 @@ CONFIG_YAM=m CONFIG_KERNEL_LZMA=y ## end choice -## -## file: net/econet/Kconfig -## -CONFIG_ECONET_AUNUDP=y -CONFIG_ECONET_NATIVE=y - ## ### file: drivers/input/mouse/Kconfig ## diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x index 5c47a8ae6..373bda194 100644 --- a/debian/config/armel/config.iop32x +++ b/debian/config/armel/config.iop32x @@ -665,11 +665,6 @@ CONFIG_DECNET=m ## # CONFIG_DECNET_NF_GRABULATOR is not set -## -## file: net/econet/Kconfig -## -# CONFIG_ECONET is not set - ## ## file: net/ipx/Kconfig ## diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index 6dd263b9d..f979f6aec 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -746,11 +746,6 @@ CONFIG_DECNET_ROUTER=y ## # CONFIG_DECNET_NF_GRABULATOR is not set -## -## file: net/econet/Kconfig -## -# CONFIG_ECONET is not set - ## ## file: net/ipx/Kconfig ## diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile index 4bc0be90b..76d577a53 100644 --- a/debian/config/armel/config.versatile +++ b/debian/config/armel/config.versatile @@ -430,11 +430,6 @@ CONFIG_FLATMEM_MANUAL=y CONFIG_DECNET=m CONFIG_DECNET_ROUTER=y -## -## file: net/econet/Kconfig -## -# CONFIG_ECONET is not set - ## ## file: net/ipx/Kconfig ## diff --git a/debian/config/config b/debian/config/config index d9d6510ec..d7f4e9558 100644 --- a/debian/config/config +++ b/debian/config/config @@ -3769,6 +3769,11 @@ CONFIG_IP_DCCP_CCID3_RTO=100 ## # CONFIG_NET_DSA is not set +## +## file: net/econet/Kconfig +## +# CONFIG_NET_ECONET is not set + ## ## file: net/ieee802154/Kconfig ## diff --git a/debian/config/hppa/config b/debian/config/hppa/config index b022a5406..bb37852fe 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -622,11 +622,6 @@ CONFIG_FLATMEM_MANUAL=y ## # CONFIG_DECNET is not set -## -## file: net/econet/Kconfig -## -# CONFIG_ECONET is not set - ## ## file: net/ipv4/Kconfig ## diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 48c9c83dc..73e399b9e 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1403,13 +1403,6 @@ CONFIG_DECNET=m ## CONFIG_DECNET_NF_GRABULATOR=m -## -## file: net/econet/Kconfig -## -CONFIG_ECONET=m -CONFIG_ECONET_AUNUDP=y -CONFIG_ECONET_NATIVE=y - ## ## file: net/ipv6/Kconfig ## diff --git a/debian/config/m68k/config b/debian/config/m68k/config index 150d7caea..5a225df02 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -257,11 +257,6 @@ CONFIG_SYSFS=y ## # CONFIG_DECNET is not set -## -## file: net/econet/Kconfig -## -# CONFIG_ECONET is not set - ## ## file: net/ipv4/Kconfig ## diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index d1446c055..8367219f4 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -1075,13 +1075,6 @@ CONFIG_DECNET=m ## CONFIG_DECNET_NF_GRABULATOR=m -## -## file: net/econet/Kconfig -## -CONFIG_ECONET=m -CONFIG_ECONET_AUNUDP=y -CONFIG_ECONET_NATIVE=y - ## ## file: net/ipx/Kconfig ## diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 3fa5c9799..23bdca0be 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1137,13 +1137,6 @@ CONFIG_DECNET=m ## CONFIG_DECNET_NF_GRABULATOR=m -## -## file: net/econet/Kconfig -## -CONFIG_ECONET=m -CONFIG_ECONET_AUNUDP=y -CONFIG_ECONET_NATIVE=y - ## ## file: net/ipx/Kconfig ## diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index b84f31aa7..047fe3341 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -516,11 +516,6 @@ CONFIG_FLATMEM_MANUAL=y ## # CONFIG_DECNET is not set -## -## file: net/econet/Kconfig -## -# CONFIG_ECONET is not set - ## ## file: net/ipx/Kconfig ## diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index e4bf5d94d..a97b2719f 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -734,11 +734,6 @@ CONFIG_FLATMEM_MANUAL=y ## # CONFIG_DECNET is not set -## -## file: net/econet/Kconfig -## -# CONFIG_ECONET is not set - ## ## file: net/ipv4/Kconfig ## diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index a71750e39..8cc1825e1 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -756,11 +756,6 @@ CONFIG_FLATMEM_MANUAL=y ## # CONFIG_DECNET is not set -## -## file: net/econet/Kconfig -## -# CONFIG_ECONET is not set - ## ## file: net/ipv4/Kconfig ## diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 27528cbec..82de783ee 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -691,11 +691,6 @@ CONFIG_ROSE=m ## # CONFIG_DECNET is not set -## -## file: net/econet/Kconfig -## -# CONFIG_ECONET is not set - ## ## file: net/ipx/Kconfig ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index d120e6961..160e8baf2 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -850,13 +850,6 @@ CONFIG_DECNET_ROUTER=y ## CONFIG_DECNET_NF_GRABULATOR=m -## -## file: net/econet/Kconfig -## -CONFIG_ECONET=m -CONFIG_ECONET_AUNUDP=y -CONFIG_ECONET_NATIVE=y - ## ## file: net/ipv6/Kconfig ## diff --git a/debian/config/s390/config b/debian/config/s390/config index af241c844..79e0bf033 100644 --- a/debian/config/s390/config +++ b/debian/config/s390/config @@ -163,11 +163,6 @@ CONFIG_SPARSEMEM_MANUAL=y ## # CONFIG_DECNET is not set -## -## file: net/econet/Kconfig -## -# CONFIG_ECONET is not set - ## ## file: net/ipv6/Kconfig ## diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 2f732b54e..621608eb7 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -544,11 +544,6 @@ CONFIG_SPARSEMEM_MANUAL=y CONFIG_DECNET=m CONFIG_DECNET_ROUTER=y -## -## file: net/econet/Kconfig -## -# CONFIG_ECONET is not set - ## ## file: net/ipv4/Kconfig ##