diff options
author | Stephen Hemminger <shemminger@osdl.org> | 2006-09-24 23:13:03 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-09-24 23:13:03 -0400 |
commit | 597811ec167fa01c926a0957a91d9e39baa30e64 (patch) | |
tree | 24e6ce26a4464d21993f2cd17dbdb9aec13360ab /net | |
parent | 3d2573f7ebe507e372a23cdd3c8b03305d6e90aa (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/Kconfig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 1bbc3689cd8a..30af4a4dfcc8 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
@@ -455,7 +455,7 @@ menuconfig TCP_CONG_ADVANCED | |||
455 | modules. | 455 | modules. |
456 | 456 | ||
457 | Nearly all users can safely say no here, and a safe default | 457 | Nearly all users can safely say no here, and a safe default |
458 | selection will be made (BIC-TCP with new Reno as a fallback). | 458 | selection will be made (CUBIC with new Reno as a fallback). |
459 | 459 | ||
460 | If unsure, say N. | 460 | If unsure, say N. |
461 | 461 | ||
@@ -463,7 +463,7 @@ if TCP_CONG_ADVANCED | |||
463 | 463 | ||
464 | config TCP_CONG_BIC | 464 | config TCP_CONG_BIC |
465 | tristate "Binary Increase Congestion (BIC) control" | 465 | tristate "Binary Increase Congestion (BIC) control" |
466 | default y | 466 | default m |
467 | ---help--- | 467 | ---help--- |
468 | BIC-TCP is a sender-side only change that ensures a linear RTT | 468 | BIC-TCP is a sender-side only change that ensures a linear RTT |
469 | fairness under large windows while offering both scalability and | 469 | fairness under large windows while offering both scalability and |
@@ -477,7 +477,7 @@ config TCP_CONG_BIC | |||
477 | 477 | ||
478 | config TCP_CONG_CUBIC | 478 | config TCP_CONG_CUBIC |
479 | tristate "CUBIC TCP" | 479 | tristate "CUBIC TCP" |
480 | default m | 480 | default y |
481 | ---help--- | 481 | ---help--- |
482 | This is version 2.0 of BIC-TCP which uses a cubic growth function | 482 | This is version 2.0 of BIC-TCP which uses a cubic growth function |
483 | among other techniques. | 483 | among other techniques. |
@@ -574,7 +574,7 @@ config TCP_CONG_VENO | |||
574 | 574 | ||
575 | choice | 575 | choice |
576 | prompt "Default TCP congestion control" | 576 | prompt "Default TCP congestion control" |
577 | default DEFAULT_BIC | 577 | default DEFAULT_CUBIC |
578 | help | 578 | help |
579 | Select the TCP congestion control that will be used by default | 579 | Select the TCP congestion control that will be used by default |
580 | for all connections. | 580 | for all connections. |
@@ -601,7 +601,7 @@ endchoice | |||
601 | 601 | ||
602 | endif | 602 | endif |
603 | 603 | ||
604 | config TCP_CONG_BIC | 604 | config TCP_CONG_CUBIC |
605 | tristate | 605 | tristate |
606 | depends on !TCP_CONG_ADVANCED | 606 | depends on !TCP_CONG_ADVANCED |
607 | default y | 607 | default y |
@@ -614,7 +614,7 @@ config DEFAULT_TCP_CONG | |||
614 | default "vegas" if DEFAULT_VEGAS | 614 | default "vegas" if DEFAULT_VEGAS |
615 | default "westwood" if DEFAULT_WESTWOOD | 615 | default "westwood" if DEFAULT_WESTWOOD |
616 | default "reno" if DEFAULT_RENO | 616 | default "reno" if DEFAULT_RENO |
617 | default "bic" | 617 | default "cubic" |
618 | 618 | ||
619 | source "net/ipv4/ipvs/Kconfig" | 619 | source "net/ipv4/ipvs/Kconfig" |
620 | 620 | ||