unify congestion control options

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15844 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 0 insertions, 34 deletions

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