summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-09-24 20:13:03 -0700
committerDavid S. Miller <davem@davemloft.net>2006-09-24 20:13:03 -0700
commit597811ec167fa01c926a0957a91d9e39baa30e64 (patch)
tree24e6ce26a4464d21993f2cd17dbdb9aec13360ab /net
parent3d2573f7ebe507e372a23cdd3c8b03305d6e90aa (diff)
[TCP]: make cubic the default
Change default congestion control used from BIC to the newer CUBIC which it the successor to BIC but has better properties over long delay links. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/Kconfig12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 1bbc3689cd8..30af4a4dfcc 100644
--- a/net/ipv4/Kconfig
+++ b/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"