From 5737e0967b07f7db3bdfe6f43afabb11018f0eb3 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Thu, 24 Apr 2008 06:30:43 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/config/config: Set TCP_CONG_CUBIC as default. svn path=/dists/trunk/linux-2.6/; revision=11145 --- debian/changelog | 2 ++ debian/config/config | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2afd285bc..534b8fdee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -96,6 +96,8 @@ linux-2.6 (2.6.25-1~experimental.1) UNRELEASED; urgency=low * [i386/486] Make ext2 modular. * [alpha,amd64,i386] Make ATM modular. * [powerpc/powerpc64] Support PA Semi based plattforms. (closes: #463200) + * Follow upstream change for default TCP congestion control. + (closes: #477589) [ Steve Langasek ] * topconfig: Enable CONFIG_CIFS_WEAK_PW_HASH, required for compatibility diff --git a/debian/config/config b/debian/config/config index cce8473d3..d792d6942 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2049,8 +2049,8 @@ CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_LRO=m CONFIG_INET_DIAG=m CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_BIC=y -CONFIG_TCP_CONG_CUBIC=m +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y CONFIG_TCP_CONG_WESTWOOD=m CONFIG_TCP_CONG_HTCP=m CONFIG_TCP_CONG_HSTCP=m @@ -2062,8 +2062,8 @@ CONFIG_TCP_CONG_VENO=m CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_CONG_ILLINOIS=m ## choice: Default TCP congestion control -CONFIG_DEFAULT_BIC=y -# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_BIC is not set +CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_HTCP is not set # CONFIG_DEFAULT_VEGAS is not set # CONFIG_DEFAULT_WESTWOOD is not set