[kernel] r11145 - in dists/trunk/linux-2.6/debian: . config

[Bastian Blank]

Author: waldi
Date: Thu Apr 24 06:30:43 2008
New Revision: 11145

Log:
* debian/changelog: Update.
* debian/config/config: Set TCP_CONG_CUBIC as default.


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Apr 24 06:30:43 2008
@@ -96,6 +96,8 @@
   * [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

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	(original)
+++ dists/trunk/linux-2.6/debian/config/config	Thu Apr 24 06:30:43 2008
@@ -2049,8 +2049,8 @@
 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_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