From c83d91fcfc5b8e6221870dbd8531df2a17e637ea Mon Sep 17 00:00:00 2001 From: Imre Kaloz <kaloz@openwrt.org> Date: Thu, 14 May 2009 12:42:07 +0000 Subject: unify congestion control options SVN-Revision: 15844 --- target/linux/ar71xx/config-2.6.29 | 2 -- target/linux/ar71xx/config-2.6.30 | 2 -- target/linux/brcm63xx/config-2.6.27 | 4 ---- target/linux/cavium-octeon/config-default | 3 --- target/linux/cobalt/config-default | 3 --- target/linux/etrax/config-2.6.30 | 2 -- target/linux/gemini/config-default | 3 --- target/linux/generic-2.6/config-2.6.21 | 10 +++++----- target/linux/generic-2.6/config-2.6.23 | 10 +++++----- target/linux/generic-2.6/config-2.6.25 | 10 +++++----- target/linux/generic-2.6/config-2.6.27 | 10 +++++----- target/linux/generic-2.6/config-2.6.28 | 10 +++++----- target/linux/generic-2.6/config-2.6.29 | 6 +++--- target/linux/generic-2.6/config-2.6.30 | 6 +++--- target/linux/iop32x/config-default | 10 ---------- target/linux/ixp4xx/config-2.6.27 | 10 ---------- target/linux/ixp4xx/config-2.6.28 | 10 ---------- target/linux/ixp4xx/config-2.6.29 | 2 -- target/linux/ixp4xx/config-2.6.30 | 2 -- target/linux/ixp4xx/config-default | 10 ---------- target/linux/kirkwood/config-default | 3 --- target/linux/orion/config-default | 10 ---------- target/linux/ps3/config-2.6.28 | 3 --- target/linux/pxa/config-default | 3 --- target/linux/s3c24xx/config-2.6.28 | 3 --- target/linux/s3c24xx/config-2.6.29 | 3 --- target/linux/storm/config-default | 3 --- target/linux/x86/config-2.6.29 | 2 -- target/linux/x86/config-2.6.30 | 2 -- 29 files changed, 31 insertions(+), 126 deletions(-) (limited to 'target') diff --git a/target/linux/ar71xx/config-2.6.29 b/target/linux/ar71xx/config-2.6.29 index 2fd9276f6f..d741afe06c 100644 --- a/target/linux/ar71xx/config-2.6.29 +++ b/target/linux/ar71xx/config-2.6.29 @@ -71,8 +71,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y CONFIG_CSRC_R4K=y CONFIG_CSRC_R4K_LIB=y # CONFIG_DCB is not set -CONFIG_DEFAULT_VEGAS=y -# CONFIG_DEFAULT_WESTWOOD is not set CONFIG_DEVPORT=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_DM9000 is not set diff --git a/target/linux/ar71xx/config-2.6.30 b/target/linux/ar71xx/config-2.6.30 index ac825c7f29..960d42ecf5 100644 --- a/target/linux/ar71xx/config-2.6.30 +++ b/target/linux/ar71xx/config-2.6.30 @@ -73,8 +73,6 @@ CONFIG_CRYPTO_WORKQUEUE=m CONFIG_CSRC_R4K=y CONFIG_CSRC_R4K_LIB=y CONFIG_DECOMPRESS_LZMA=y -CONFIG_DEFAULT_VEGAS=y -# CONFIG_DEFAULT_WESTWOOD is not set CONFIG_DEVPORT=y # CONFIG_DM9000 is not set CONFIG_DMA_NEED_PCI_MAP_STATE=y diff --git a/target/linux/brcm63xx/config-2.6.27 b/target/linux/brcm63xx/config-2.6.27 index fb72aa26b7..80258cd93e 100644 --- a/target/linux/brcm63xx/config-2.6.27 +++ b/target/linux/brcm63xx/config-2.6.27 @@ -63,8 +63,6 @@ CONFIG_DEFAULT_BIC=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_IOSCHED="cfq" -CONFIG_DEFAULT_TCP_CONG="bic" -# CONFIG_DEFAULT_VEGAS is not set CONFIG_DEVPORT=y # CONFIG_DM9000 is not set CONFIG_DMA_NEED_PCI_MAP_STATE=y @@ -203,8 +201,6 @@ CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y CONFIG_SYS_SUPPORTS_ARBIT_HZ=y CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y # CONFIG_TC35815 is not set -CONFIG_TCP_CONG_BIC=y -# CONFIG_TCP_CONG_VEGAS is not set CONFIG_TICK_ONESHOT=y CONFIG_TRAD_SIGNALS=y CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y diff --git a/target/linux/cavium-octeon/config-default b/target/linux/cavium-octeon/config-default index 5472f6850f..3ee093bbcb 100644 --- a/target/linux/cavium-octeon/config-default +++ b/target/linux/cavium-octeon/config-default @@ -124,7 +124,6 @@ CONFIG_DECOMPRESS_LZMA=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_IOSCHED="cfq" -CONFIG_DEFAULT_TCP_CONG="cubic" CONFIG_DETECT_HUNG_TASK=y CONFIG_DETECT_SOFTLOCKUP=y CONFIG_DEVKMEM=y @@ -372,8 +371,6 @@ CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y CONFIG_SYS_SUPPORTS_HIGHMEM=y CONFIG_SYS_SUPPORTS_SMP=y # CONFIG_TC35815 is not set -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_CUBIC=y # CONFIG_TIMER_STATS is not set CONFIG_TRACING_SUPPORT=y CONFIG_UNEVICTABLE_LRU=y diff --git a/target/linux/cobalt/config-default b/target/linux/cobalt/config-default index 0cea7f04ab..28593ea027 100644 --- a/target/linux/cobalt/config-default +++ b/target/linux/cobalt/config-default @@ -80,7 +80,6 @@ CONFIG_DE2104X=y CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_IOSCHED="anticipatory" -CONFIG_DEFAULT_TCP_CONG="cubic" CONFIG_DEVKMEM=y CONFIG_DEVPORT=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set @@ -376,8 +375,6 @@ CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y CONFIG_SYS_SUPPORTS_ARBIT_HZ=y CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_CUBIC=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TULIP=y CONFIG_TULIP_MMIO=y diff --git a/target/linux/etrax/config-2.6.30 b/target/linux/etrax/config-2.6.30 index 328d2ab6c3..b4d410712b 100644 --- a/target/linux/etrax/config-2.6.30 +++ b/target/linux/etrax/config-2.6.30 @@ -8,8 +8,6 @@ CONFIG_BOUNCE=y # CONFIG_BRIDGE is not set CONFIG_CRIS=y # CONFIG_CRIS_MACH_ARTPEC3 is not set -CONFIG_DEFAULT_VEGAS=y -# CONFIG_DEFAULT_WESTWOOD is not set # CONFIG_ETRAX100LX is not set CONFIG_ETRAX100LX_V2=y # CONFIG_ETRAXFS is not set diff --git a/target/linux/gemini/config-default b/target/linux/gemini/config-default index fe32148a1d..235982b842 100644 --- a/target/linux/gemini/config-default +++ b/target/linux/gemini/config-default @@ -42,7 +42,6 @@ CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_GF128MUL=m # CONFIG_DCB is not set # CONFIG_DEBUG_USER is not set -CONFIG_DEFAULT_TCP_CONG="westwood" CONFIG_DETECT_SOFTLOCKUP=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set CONFIG_DLCI=m @@ -140,8 +139,6 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_SWAP is not set CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_SYSVIPC_SYSCTL=y -CONFIG_TCP_CONG_VEGAS=m -CONFIG_TCP_CONG_WESTWOOD=y # CONFIG_TIMER_STATS is not set # CONFIG_TRACE_BRANCH_PROFILING is not set CONFIG_UID16=y diff --git a/target/linux/generic-2.6/config-2.6.21 b/target/linux/generic-2.6/config-2.6.21 index 69d283b65c..bebdcb8d10 100644 --- a/target/linux/generic-2.6/config-2.6.21 +++ b/target/linux/generic-2.6/config-2.6.21 @@ -300,9 +300,9 @@ CONFIG_DEFAULT_DEADLINE=y CONFIG_DEFAULT_IOSCHED="deadline" # CONFIG_DEFAULT_NOOP is not set # CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="vegas" -CONFIG_DEFAULT_VEGAS=y -# CONFIG_DEFAULT_WESTWOOD is not set +CONFIG_DEFAULT_TCP_CONG="westwood" +# CONFIG_DEFAULT_VEGAS is not set +CONFIG_DEFAULT_WESTWOOD=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # CONFIG_DEVFS_DEBUG is not set CONFIG_DEVFS_FS=y @@ -1445,9 +1445,9 @@ CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_HYBLA is not set # CONFIG_TCP_CONG_LP is not set # CONFIG_TCP_CONG_SCALABLE is not set -CONFIG_TCP_CONG_VEGAS=y +# CONFIG_TCP_CONG_VEGAS is not set # CONFIG_TCP_CONG_VENO is not set -# CONFIG_TCP_CONG_WESTWOOD is not set +CONFIG_TCP_CONG_WESTWOOD=y # CONFIG_TCP_MD5SIG is not set # CONFIG_TEXTSEARCH_BM is not set # CONFIG_TEXTSEARCH_FSM is not set diff --git a/target/linux/generic-2.6/config-2.6.23 b/target/linux/generic-2.6/config-2.6.23 index 7ada2222aa..f143ef1ca2 100644 --- a/target/linux/generic-2.6/config-2.6.23 +++ b/target/linux/generic-2.6/config-2.6.23 @@ -324,9 +324,9 @@ CONFIG_DEFAULT_DEADLINE=y CONFIG_DEFAULT_IOSCHED="deadline" # CONFIG_DEFAULT_NOOP is not set # CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="vegas" -CONFIG_DEFAULT_VEGAS=y -# CONFIG_DEFAULT_WESTWOOD is not set +CONFIG_DEFAULT_TCP_CONG="westwood" +# CONFIG_DEFAULT_VEGAS is not set +CONFIG_DEFAULT_WESTWOOD=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # CONFIG_DEVFS_DEBUG is not set CONFIG_DEVFS_FS=y @@ -1565,9 +1565,9 @@ CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_ILLINOIS is not set # CONFIG_TCP_CONG_LP is not set # CONFIG_TCP_CONG_SCALABLE is not set -CONFIG_TCP_CONG_VEGAS=y +# CONFIG_TCP_CONG_VEGAS is not set # CONFIG_TCP_CONG_VENO is not set -# CONFIG_TCP_CONG_WESTWOOD is not set +CONFIG_TCP_CONG_WESTWOOD=y # CONFIG_TCP_CONG_YEAH is not set # CONFIG_TCP_MD5SIG is not set # CONFIG_TEXTSEARCH_BM is not set diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25 index edead10550..522e84f6b3 100644 --- a/target/linux/generic-2.6/config-2.6.25 +++ b/target/linux/generic-2.6/config-2.6.25 @@ -341,9 +341,9 @@ CONFIG_DEFAULT_DEADLINE=y CONFIG_DEFAULT_IOSCHED="deadline" # CONFIG_DEFAULT_NOOP is not set # CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="vegas" -CONFIG_DEFAULT_VEGAS=y -# CONFIG_DEFAULT_WESTWOOD is not set +CONFIG_DEFAULT_TCP_CONG="westwood" +# CONFIG_DEFAULT_VEGAS is not set +CONFIG_DEFAULT_WESTWOOD=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # CONFIG_DEVFS_DEBUG is not set CONFIG_DEVFS_FS=y @@ -1670,9 +1670,9 @@ CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_ILLINOIS is not set # CONFIG_TCP_CONG_LP is not set # CONFIG_TCP_CONG_SCALABLE is not set -CONFIG_TCP_CONG_VEGAS=y +# CONFIG_TCP_CONG_VEGAS is not set # CONFIG_TCP_CONG_VENO is not set -# CONFIG_TCP_CONG_WESTWOOD is not set +CONFIG_TCP_CONG_WESTWOOD=y # CONFIG_TCP_CONG_YEAH is not set # CONFIG_TCP_MD5SIG is not set # CONFIG_TEXTSEARCH_BM is not set diff --git a/target/linux/generic-2.6/config-2.6.27 b/target/linux/generic-2.6/config-2.6.27 index 3c0b0cd4c6..60f9bbd984 100644 --- a/target/linux/generic-2.6/config-2.6.27 +++ b/target/linux/generic-2.6/config-2.6.27 @@ -368,9 +368,9 @@ CONFIG_DEFAULT_DEADLINE=y CONFIG_DEFAULT_IOSCHED="deadline" # CONFIG_DEFAULT_NOOP is not set # CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="vegas" -CONFIG_DEFAULT_VEGAS=y -# CONFIG_DEFAULT_WESTWOOD is not set +CONFIG_DEFAULT_TCP_CONG="westwood" +# CONFIG_DEFAULT_VEGAS is not set +CONFIG_DEFAULT_WESTWOOD=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # CONFIG_DEVKMEM is not set # CONFIG_DGRS is not set @@ -1810,9 +1810,9 @@ CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_ILLINOIS is not set # CONFIG_TCP_CONG_LP is not set # CONFIG_TCP_CONG_SCALABLE is not set -CONFIG_TCP_CONG_VEGAS=y +# CONFIG_TCP_CONG_VEGAS is not set # CONFIG_TCP_CONG_VENO is not set -# CONFIG_TCP_CONG_WESTWOOD is not set +CONFIG_TCP_CONG_WESTWOOD=y # CONFIG_TCP_CONG_YEAH is not set # CONFIG_TCP_MD5SIG is not set # CONFIG_TEXTSEARCH_BM is not set diff --git a/target/linux/generic-2.6/config-2.6.28 b/target/linux/generic-2.6/config-2.6.28 index 755b67d177..c0839c84bc 100644 --- a/target/linux/generic-2.6/config-2.6.28 +++ b/target/linux/generic-2.6/config-2.6.28 @@ -385,9 +385,9 @@ CONFIG_DEFAULT_DEADLINE=y CONFIG_DEFAULT_IOSCHED="deadline" # CONFIG_DEFAULT_NOOP is not set # CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="vegas" -CONFIG_DEFAULT_VEGAS=y -# CONFIG_DEFAULT_WESTWOOD is not set +CONFIG_DEFAULT_TCP_CONG="westwood" +# CONFIG_DEFAULT_VEGAS is not set +CONFIG_DEFAULT_WESTWOOD=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # CONFIG_DEVKMEM is not set # CONFIG_DGRS is not set @@ -1894,9 +1894,9 @@ CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_ILLINOIS is not set # CONFIG_TCP_CONG_LP is not set # CONFIG_TCP_CONG_SCALABLE is not set -CONFIG_TCP_CONG_VEGAS=y +# CONFIG_TCP_CONG_VEGAS is not set # CONFIG_TCP_CONG_VENO is not set -# CONFIG_TCP_CONG_WESTWOOD is not set +CONFIG_TCP_CONG_WESTWOOD=y # CONFIG_TCP_CONG_YEAH is not set # CONFIG_TCP_MD5SIG is not set # CONFIG_TEXTSEARCH_BM is not set diff --git a/target/linux/generic-2.6/config-2.6.29 b/target/linux/generic-2.6/config-2.6.29 index d8b71540d2..a120b54337 100644 --- a/target/linux/generic-2.6/config-2.6.29 +++ b/target/linux/generic-2.6/config-2.6.29 @@ -393,7 +393,7 @@ CONFIG_DEFAULT_DEADLINE=y CONFIG_DEFAULT_IOSCHED="deadline" # CONFIG_DEFAULT_NOOP is not set # CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="vegas" +CONFIG_DEFAULT_TCP_CONG="westwood" # CONFIG_DEFAULT_VEGAS is not set CONFIG_DEFAULT_WESTWOOD=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -1928,9 +1928,9 @@ CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_ILLINOIS is not set # CONFIG_TCP_CONG_LP is not set # CONFIG_TCP_CONG_SCALABLE is not set -CONFIG_TCP_CONG_VEGAS=y +# CONFIG_TCP_CONG_VEGAS is not set # CONFIG_TCP_CONG_VENO is not set -# CONFIG_TCP_CONG_WESTWOOD is not set +CONFIG_TCP_CONG_WESTWOOD=y # CONFIG_TCP_CONG_YEAH is not set # CONFIG_TCP_MD5SIG is not set # CONFIG_TEXTSEARCH_BM is not set diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30 index 38f6fecbe7..f0ffcf7121 100644 --- a/target/linux/generic-2.6/config-2.6.30 +++ b/target/linux/generic-2.6/config-2.6.30 @@ -403,7 +403,7 @@ CONFIG_DEFAULT_DEADLINE=y CONFIG_DEFAULT_IOSCHED="deadline" # CONFIG_DEFAULT_NOOP is not set # CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="vegas" +CONFIG_DEFAULT_TCP_CONG="westwood" # CONFIG_DEFAULT_VEGAS is not set CONFIG_DEFAULT_WESTWOOD=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -1984,9 +1984,9 @@ CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_ILLINOIS is not set # CONFIG_TCP_CONG_LP is not set # CONFIG_TCP_CONG_SCALABLE is not set -CONFIG_TCP_CONG_VEGAS=y +# CONFIG_TCP_CONG_VEGAS is not set # CONFIG_TCP_CONG_VENO is not set -# CONFIG_TCP_CONG_WESTWOOD is not set +CONFIG_TCP_CONG_WESTWOOD=y # CONFIG_TCP_CONG_YEAH is not set # CONFIG_TCP_MD5SIG is not set # CONFIG_TEXTSEARCH_BM is not set diff --git a/target/linux/iop32x/config-default b/target/linux/iop32x/config-default index 3d3b0192be..795e200a97 100644 --- a/target/linux/iop32x/config-default +++ b/target/linux/iop32x/config-default @@ -49,9 +49,6 @@ CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_GF128MUL=m # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_USER is not set -CONFIG_DEFAULT_TCP_CONG="westwood" -# CONFIG_DEFAULT_VEGAS is not set -CONFIG_DEFAULT_WESTWOOD=y CONFIG_DEVPORT=y CONFIG_DLCI=m CONFIG_DLCI_MAX=8 @@ -202,13 +199,6 @@ CONFIG_SLABINFO=y CONFIG_SPLIT_PTLOCK_CPUS=4096 # CONFIG_SWAP is not set CONFIG_SYS_SUPPORTS_APM_EMULATION=y -# CONFIG_TCP_CONG_HSTCP is not set -# CONFIG_TCP_CONG_HYBLA is not set -# CONFIG_TCP_CONG_LP is not set -# CONFIG_TCP_CONG_SCALABLE is not set -CONFIG_TCP_CONG_VEGAS=m -# CONFIG_TCP_CONG_VENO is not set -CONFIG_TCP_CONG_WESTWOOD=y # CONFIG_TICK_ONESHOT is not set CONFIG_TINY_SHMEM=y # CONFIG_TUN is not set diff --git a/target/linux/ixp4xx/config-2.6.27 b/target/linux/ixp4xx/config-2.6.27 index f99f6d9b5d..77f6dbb439 100644 --- a/target/linux/ixp4xx/config-2.6.27 +++ b/target/linux/ixp4xx/config-2.6.27 @@ -51,9 +51,6 @@ CONFIG_CPU_XSCALE=y CONFIG_CRC16=y # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_USER is not set -CONFIG_DEFAULT_TCP_CONG="westwood" -# CONFIG_DEFAULT_VEGAS is not set -CONFIG_DEFAULT_WESTWOOD=y CONFIG_DEVPORT=y # CONFIG_DM9000 is not set CONFIG_DMABOUNCE=y @@ -203,13 +200,6 @@ CONFIG_SLABINFO=y CONFIG_SND_USB=y CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_SYS_SUPPORTS_APM_EMULATION=y -# CONFIG_TCP_CONG_HSTCP is not set -# CONFIG_TCP_CONG_HYBLA is not set -# CONFIG_TCP_CONG_LP is not set -# CONFIG_TCP_CONG_SCALABLE is not set -# CONFIG_TCP_CONG_VEGAS is not set -# CONFIG_TCP_CONG_VENO is not set -CONFIG_TCP_CONG_WESTWOOD=y CONFIG_TICK_ONESHOT=y CONFIG_TINY_SHMEM=y CONFIG_UID16=y diff --git a/target/linux/ixp4xx/config-2.6.28 b/target/linux/ixp4xx/config-2.6.28 index d9172e1745..e2f5f8478d 100644 --- a/target/linux/ixp4xx/config-2.6.28 +++ b/target/linux/ixp4xx/config-2.6.28 @@ -51,9 +51,6 @@ CONFIG_CPU_XSCALE=y CONFIG_CRC16=y # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_USER is not set -CONFIG_DEFAULT_TCP_CONG="westwood" -# CONFIG_DEFAULT_VEGAS is not set -CONFIG_DEFAULT_WESTWOOD=y CONFIG_DEVPORT=y # CONFIG_DM9000 is not set CONFIG_DMABOUNCE=y @@ -209,13 +206,6 @@ CONFIG_SLABINFO=y CONFIG_SND_USB=y CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_SYS_SUPPORTS_APM_EMULATION=y -# CONFIG_TCP_CONG_HSTCP is not set -# CONFIG_TCP_CONG_HYBLA is not set -# CONFIG_TCP_CONG_LP is not set -# CONFIG_TCP_CONG_SCALABLE is not set -# CONFIG_TCP_CONG_VEGAS is not set -# CONFIG_TCP_CONG_VENO is not set -CONFIG_TCP_CONG_WESTWOOD=y CONFIG_TICK_ONESHOT=y CONFIG_TINY_SHMEM=y CONFIG_UID16=y diff --git a/target/linux/ixp4xx/config-2.6.29 b/target/linux/ixp4xx/config-2.6.29 index 38a73f1d93..00c0badff0 100644 --- a/target/linux/ixp4xx/config-2.6.29 +++ b/target/linux/ixp4xx/config-2.6.29 @@ -40,8 +40,6 @@ CONFIG_CRC16=y # CONFIG_DCB is not set # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_USER is not set -CONFIG_DEFAULT_VEGAS=y -# CONFIG_DEFAULT_WESTWOOD is not set CONFIG_DEVPORT=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_DM9000 is not set diff --git a/target/linux/ixp4xx/config-2.6.30 b/target/linux/ixp4xx/config-2.6.30 index c5bdbcd20d..b843260836 100644 --- a/target/linux/ixp4xx/config-2.6.30 +++ b/target/linux/ixp4xx/config-2.6.30 @@ -40,8 +40,6 @@ CONFIG_CRC16=y # CONFIG_DCB is not set # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_USER is not set -CONFIG_DEFAULT_VEGAS=y -# CONFIG_DEFAULT_WESTWOOD is not set CONFIG_DEVPORT=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_DM9000 is not set diff --git a/target/linux/ixp4xx/config-default b/target/linux/ixp4xx/config-default index 895a8f841c..1344f3dc2a 100644 --- a/target/linux/ixp4xx/config-default +++ b/target/linux/ixp4xx/config-default @@ -54,9 +54,6 @@ CONFIG_CRC16=y CONFIG_CRYPTO_HW=y # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_USER is not set -CONFIG_DEFAULT_TCP_CONG="westwood" -# CONFIG_DEFAULT_VEGAS is not set -CONFIG_DEFAULT_WESTWOOD=y CONFIG_DEVPORT=y CONFIG_DLCI=m CONFIG_DLCI_MAX=8 @@ -238,13 +235,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SMC91X is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_SYS_SUPPORTS_APM_EMULATION=y -# CONFIG_TCP_CONG_HSTCP is not set -# CONFIG_TCP_CONG_HYBLA is not set -# CONFIG_TCP_CONG_LP is not set -# CONFIG_TCP_CONG_SCALABLE is not set -CONFIG_TCP_CONG_VEGAS=m -# CONFIG_TCP_CONG_VENO is not set -CONFIG_TCP_CONG_WESTWOOD=y CONFIG_TICK_ONESHOT=y CONFIG_TINY_SHMEM=y CONFIG_UID16=y diff --git a/target/linux/kirkwood/config-default b/target/linux/kirkwood/config-default index 7f2c89e57a..613ca97742 100644 --- a/target/linux/kirkwood/config-default +++ b/target/linux/kirkwood/config-default @@ -38,7 +38,6 @@ CONFIG_CRC16=y # CONFIG_DCB is not set # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_USER is not set -CONFIG_DEFAULT_TCP_CONG="westwood" CONFIG_DEVPORT=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set CONFIG_DLCI=m @@ -151,8 +150,6 @@ CONFIG_SCSI=m CONFIG_SPLIT_PTLOCK_CPUS=4096 # CONFIG_SWAP is not set CONFIG_SYS_SUPPORTS_APM_EMULATION=y -CONFIG_TCP_CONG_VEGAS=m -CONFIG_TCP_CONG_WESTWOOD=y CONFIG_TICK_ONESHOT=y CONFIG_UID16=y CONFIG_USB=m diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default index ad79e906a5..a7884ddf85 100644 --- a/target/linux/orion/config-default +++ b/target/linux/orion/config-default @@ -48,9 +48,6 @@ CONFIG_CRC16=y # CONFIG_CRC_CCITT is not set # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_USER is not set -CONFIG_DEFAULT_TCP_CONG="westwood" -# CONFIG_DEFAULT_VEGAS is not set -CONFIG_DEFAULT_WESTWOOD=y CONFIG_DEVPORT=y CONFIG_DLCI=m CONFIG_DLCI_MAX=8 @@ -222,13 +219,6 @@ CONFIG_SLABINFO=y CONFIG_SPLIT_PTLOCK_CPUS=4096 # CONFIG_SWAP is not set CONFIG_SYS_SUPPORTS_APM_EMULATION=y -# CONFIG_TCP_CONG_HSTCP is not set -# CONFIG_TCP_CONG_HYBLA is not set -# CONFIG_TCP_CONG_LP is not set -# CONFIG_TCP_CONG_SCALABLE is not set -CONFIG_TCP_CONG_VEGAS=m -# CONFIG_TCP_CONG_VENO is not set -CONFIG_TCP_CONG_WESTWOOD=y CONFIG_TICK_ONESHOT=y CONFIG_TINY_SHMEM=y # CONFIG_TUN is not set diff --git a/target/linux/ps3/config-2.6.28 b/target/linux/ps3/config-2.6.28 index c157985bd9..cc6d6e6313 100644 --- a/target/linux/ps3/config-2.6.28 +++ b/target/linux/ps3/config-2.6.28 @@ -59,7 +59,6 @@ CONFIG_CRYPTO_RNG2=y CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_IOSCHED="anticipatory" -CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_DEFAULT_UIMAGE is not set CONFIG_DEVKMEM=y CONFIG_DNOTIFY=y @@ -337,8 +336,6 @@ CONFIG_SUNRPC_GSS=y # CONFIG_SYN_COOKIES is not set # CONFIG_SYSCTL_SYSCALL_CHECK is not set CONFIG_SYSVIPC_COMPAT=y -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_CUBIC=y CONFIG_TINY_SHMEM=y CONFIG_TUNE_CELL=y # CONFIG_U3_DART is not set diff --git a/target/linux/pxa/config-default b/target/linux/pxa/config-default index 30b693200f..74491ee0bd 100644 --- a/target/linux/pxa/config-default +++ b/target/linux/pxa/config-default @@ -59,7 +59,6 @@ CONFIG_CPU_XSCALE=y # CONFIG_CRC16 is not set # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_USER is not set -CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_DM9000 is not set CONFIG_DUMMY_CONSOLE=y CONFIG_ENABLE_MUST_CHECK=y @@ -227,8 +226,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096 # CONFIG_SYN_COOKIES is not set # CONFIG_SYSCTL_SYSCALL is not set CONFIG_SYS_SUPPORTS_APM_EMULATION=y -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_CUBIC=y CONFIG_TINY_SHMEM=y # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_GUNZE is not set diff --git a/target/linux/s3c24xx/config-2.6.28 b/target/linux/s3c24xx/config-2.6.28 index 1d586ac616..6fe5a0428a 100644 --- a/target/linux/s3c24xx/config-2.6.28 +++ b/target/linux/s3c24xx/config-2.6.28 @@ -107,7 +107,6 @@ CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_DEBUG_S3C_UART=2 # CONFIG_DEBUG_USER is not set -CONFIG_DEFAULT_TCP_CONG="cubic" CONFIG_DISPLAY_JBT6K74=y CONFIG_DISPLAY_SUPPORT=y CONFIG_DMADEVICES=y @@ -442,8 +441,6 @@ CONFIG_SUSPEND_FREEZER=y CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_CUBIC=y CONFIG_TCP_MD5SIG=y # CONFIG_TOUCHSCREEN_ADS7846 is not set # CONFIG_TOUCHSCREEN_ELO is not set diff --git a/target/linux/s3c24xx/config-2.6.29 b/target/linux/s3c24xx/config-2.6.29 index 57d824da6e..d9ec4c3de0 100644 --- a/target/linux/s3c24xx/config-2.6.29 +++ b/target/linux/s3c24xx/config-2.6.29 @@ -100,7 +100,6 @@ CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_DEBUG_S3C_UART=2 # CONFIG_DEBUG_USER is not set -CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set CONFIG_DISPLAY_JBT6K74=y # CONFIG_DISPLAY_L1K002 is not set @@ -451,8 +450,6 @@ CONFIG_SUSPEND_FREEZER=y CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_CUBIC=y CONFIG_TCP_MD5SIG=y # CONFIG_TOUCHSCREEN_ADS7846 is not set # CONFIG_TOUCHSCREEN_ELO is not set diff --git a/target/linux/storm/config-default b/target/linux/storm/config-default index a8258c9c13..2183a6f05f 100644 --- a/target/linux/storm/config-default +++ b/target/linux/storm/config-default @@ -59,7 +59,6 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_IOSCHED="noop" CONFIG_DEFAULT_NOOP=y -CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_DETECT_SOFTLOCKUP is not set CONFIG_DEVPORT=y # CONFIG_DM9000 is not set @@ -207,8 +206,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_SYSFS_DEPRECATED=y # CONFIG_SYSVIPC is not set CONFIG_SYS_SUPPORTS_APM_EMULATION=y -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_CUBIC=y # CONFIG_TICK_ONESHOT is not set # CONFIG_TIMER_STATS is not set CONFIG_TINY_SHMEM=y diff --git a/target/linux/x86/config-2.6.29 b/target/linux/x86/config-2.6.29 index fc658a6890..fef04a97a9 100644 --- a/target/linux/x86/config-2.6.29 +++ b/target/linux/x86/config-2.6.29 @@ -86,8 +86,6 @@ CONFIG_CPU_SUP_UMC_32=y CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_DEFAULT_IO_DELAY_TYPE=0 -CONFIG_DEFAULT_VEGAS=y -# CONFIG_DEFAULT_WESTWOOD is not set # CONFIG_DELL_RBU is not set # CONFIG_DEPCA is not set CONFIG_DEVPORT=y diff --git a/target/linux/x86/config-2.6.30 b/target/linux/x86/config-2.6.30 index d03908cd9f..6d10dcf504 100644 --- a/target/linux/x86/config-2.6.30 +++ b/target/linux/x86/config-2.6.30 @@ -90,8 +90,6 @@ CONFIG_DECOMPRESS_BZIP2=y CONFIG_DECOMPRESS_GZIP=y CONFIG_DECOMPRESS_LZMA=y CONFIG_DEFAULT_IO_DELAY_TYPE=0 -CONFIG_DEFAULT_VEGAS=y -# CONFIG_DEFAULT_WESTWOOD is not set # CONFIG_DELL_RBU is not set # CONFIG_DEPCA is not set CONFIG_DEVPORT=y -- cgit v1.2.3