unify congestion control options

SVN-Revision: 15844

diff --git a/target/linux/ar71xx/config-2.6.29 b/target/linux/ar71xx/config-2.6.29
index 2fd9276f6f92e36bdd6cdb846c8f0e6f4bcdbe95..d741afe06cc78d0ded1fab652afd39a6797f3a60 100644 (file)
--- 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 ac825c7f296c8e6f70c8391c583b64fafc46ef6d..960d42ecf53cde4785cec069ff451ed902296e43 100644 (file)
--- 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 fb72aa26b7c139685bd473f69f2bbe2436d7f7c1..80258cd93e5fdf41db554d7ee5aaeaa2f86506a1 100644 (file)
--- 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 5472f6850f2c0ad47083cdf6f48043ed73102b4a..3ee093bbcb39db6cea39c7b04b91877b1192584c 100644 (file)
--- 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 0cea7f04abc2eb05e2de014c0a42d1dfb241a624..28593ea027b3d7fa1f67e897ccc104ab85fac0db 100644 (file)
--- 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 328d2ab6c33e542cab41ea2ef31574721e381465..b4d410712ba19122ced8439e7dc262f0acfcf797 100644 (file)
--- 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 fe32148a1dc707801aaa97bcded6bd447a331366..235982b84225aeec0aa661673e42bbfa92b58d4d 100644 (file)
--- 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 69d283b65c956cd61eb8449aeff092cdf76e55c2..bebdcb8d109ab7ab0c05969d234128d6cd85d088 100644 (file)
--- 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 7ada2222aa75975364ef22d195a29aaa2636894f..f143ef1ca235cff95cbcd181563814b21f0b305c 100644 (file)
--- 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 edead1055022360466c536198f4a65bf2254383b..522e84f6b3e61d2692588098a0cfb35133d57d94 100644 (file)
--- 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 3c0b0cd4c6299d6cf48409d02645171bea3c7a34..60f9bbd9840d5f95e80c38658e956acb210d5bc4 100644 (file)
--- 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 755b67d177e4a7c61b100c6f66c7e87a0dbf85ab..c0839c84bcf207e8e9ebf9a0aa9d7f82c1995d00 100644 (file)
--- 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 d8b71540d2cd728262329771b36ac6679d79586d..a120b54337a27175429fb29ddad7863f01cadb6b 100644 (file)
--- 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 38f6fecbe72ce7b1f1ec49df4e6c55ff50f134ce..f0ffcf712103c7ec6b4e886aa74f6e8223a54b57 100644 (file)
--- 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 3d3b0192bee07a7c0bc9b4e909a1863ab7a8e761..795e200a975eca973fe59f79cfde4e712702e1e8 100644 (file)
--- 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 f99f6d9b5d3638386e985277bba7f28578216224..77f6dbb43930784dff67a29a7df5258f849a97a3 100644 (file)
--- 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 d9172e1745d19eea49b5788686e82bbacb5e5d89..e2f5f8478d9ad4bfc5741f039e4a6c9af99f4ac5 100644 (file)
--- 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 38a73f1d93063b8440dd70881537d62b594f5e6a..00c0badff02922fec5dc6e6b88d5010c3f37c11d 100644 (file)
--- 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 c5bdbcd20dfadd968d862aeda39eb856588414bf..b843260836a26e2eb5efc4a71f8180dd2b077bd8 100644 (file)
--- 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 895a8f841c3623525e75ff3407d401e9440dfa7d..1344f3dc2aee8165a27bfacad712ad35fa29aa2c 100644 (file)
--- 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 7f2c89e57ad86937908e21e8bc213299ce0ea808..613ca9774296377ea1b1c91c8f2fa2870a5de93a 100644 (file)
--- 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 ad79e906a5659f2642b3879b74e58a049c22a431..a7884ddf8507ee8d3dc68e4c470ca3bea568efd4 100644 (file)
--- 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 c157985bd962ee29a9a4f65327ca17dccefb6496..cc6d6e6313ab473f46a3635274e780827726873b 100644 (file)
--- 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 30b693200ffaf68e233892a6dc106f998b99d73f..74491ee0bda9efcc832526e569a207af848b8604 100644 (file)
--- 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 1d586ac616205159961c7356d3e5d5d1832672d8..6fe5a0428ac9db24ee978b7901d38d4f1f2a3c7d 100644 (file)
--- 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 57d824da6ec4da42ba027b290b248af7465e3a8c..d9ec4c3de09c451cdbf97942c5b3342e0b7e0a71 100644 (file)
--- 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 a8258c9c13d2dec271e166f63286b9d47555c2cd..2183a6f05f5d55c1dc0892383b6593c2f612959b 100644 (file)
--- 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 fc658a68908be069e7228c922f98d1d11612cee0..fef04a97a9176ce9dde1c6c05614a92213961d44 100644 (file)
--- 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 d03908cd9fc612da31226ca3df2f9b949c37c689..6d10dcf504a750ae3650ef53586200f38759d517 100644 (file)
--- 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