* debian/changelog: Update.

* debian/config/config: Set TCP_CONG_CUBIC as default.

svn path=/dists/trunk/linux-2.6/; revision=11145
This commit is contained in:
Bastian Blank 2008-04-24 06:30:43 +00:00
parent 1c0b76c6ef
commit 5737e0967b
2 changed files with 6 additions and 4 deletions

2
debian/changelog vendored
View File

@ -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

View File

@ -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