From 9308b77b38385d4838d4a38b3586ebcf71e57ed3 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Sun, 24 Sep 2006 20:13:03 -0700
Subject: [PATCH] --- yaml --- r: 35547 b: refs/heads/master c:
 597811ec167fa01c926a0957a91d9e39baa30e64 h: refs/heads/master i:   35545:
 fa61ae22b4d2e3418cfbb085e1e5b52671058ef7   35543:
 6f2fea85e4b3ba1c5347a83af8641f99b9dd86ca v: v3

---
 [refs]                 |  2 +-
 trunk/net/ipv4/Kconfig | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 4097f90f77f9..ef8be97498e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d2573f7ebe507e372a23cdd3c8b03305d6e90aa
+refs/heads/master: 597811ec167fa01c926a0957a91d9e39baa30e64
diff --git a/trunk/net/ipv4/Kconfig b/trunk/net/ipv4/Kconfig
index 1bbc3689cd8a..30af4a4dfcc8 100644
--- a/trunk/net/ipv4/Kconfig
+++ b/trunk/net/ipv4/Kconfig
@@ -455,7 +455,7 @@ menuconfig TCP_CONG_ADVANCED
 	  modules.
 
 	  Nearly all users can safely say no here, and a safe default
-	  selection will be made (BIC-TCP with new Reno as a fallback).
+	  selection will be made (CUBIC with new Reno as a fallback).
 
 	  If unsure, say N.
 
@@ -463,7 +463,7 @@ if TCP_CONG_ADVANCED
 
 config TCP_CONG_BIC
 	tristate "Binary Increase Congestion (BIC) control"
-	default y
+	default m
 	---help---
 	BIC-TCP is a sender-side only change that ensures a linear RTT
 	fairness under large windows while offering both scalability and
@@ -477,7 +477,7 @@ config TCP_CONG_BIC
 
 config TCP_CONG_CUBIC
 	tristate "CUBIC TCP"
-	default m
+	default y
 	---help---
 	This is version 2.0 of BIC-TCP which uses a cubic growth function
 	among other techniques.
@@ -574,7 +574,7 @@ config TCP_CONG_VENO
 
 choice
 	prompt "Default TCP congestion control"
-	default DEFAULT_BIC
+	default DEFAULT_CUBIC
 	help
 	  Select the TCP congestion control that will be used by default
 	  for all connections.
@@ -601,7 +601,7 @@ endchoice
 
 endif
 
-config TCP_CONG_BIC
+config TCP_CONG_CUBIC
 	tristate
 	depends on !TCP_CONG_ADVANCED
 	default y
@@ -614,7 +614,7 @@ config DEFAULT_TCP_CONG
 	default "vegas" if DEFAULT_VEGAS
 	default "westwood" if DEFAULT_WESTWOOD
 	default "reno" if DEFAULT_RENO
-	default "bic"
+	default "cubic"
 
 source "net/ipv4/ipvs/Kconfig"