From 22466a7fda0f79af25af18b45093a5182da663f8 Mon Sep 17 00:00:00 2001 From: kaloz Date: Thu, 14 May 2009 12:42:07 +0000 Subject: unify congestion control options git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15844 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- 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 +++--- 7 files changed, 31 insertions(+), 31 deletions(-) (limited to 'target/linux/generic-2.6') diff --git a/target/linux/generic-2.6/config-2.6.21 b/target/linux/generic-2.6/config-2.6.21 index 69d283b65..bebdcb8d1 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 7ada2222a..f143ef1ca 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 edead1055..522e84f6b 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 3c0b0cd4c..60f9bbd98 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 755b67d17..c0839c84b 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 d8b71540d..a120b5433 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 38f6fecbe..f0ffcf712 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 -- cgit v1.2.3