aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2005-06-24 21:07:51 -0400
committerDavid S. Miller <davem@davemloft.net>2005-06-24 21:07:51 -0400
commita6484045fdd4154f8c8ee8c1dda4e32854c047e0 (patch)
tree0193c459be988a1c151cf7340a27f893adbf8e70 /net
parentbb298ca3ce92574d57c4e49b329421425ea7d279 (diff)
[TCP]: Do not present confusing congestion control options by default.
Create TCP_CONG_ADVANCED option, akin to IP_ADVANCED_ROUTER, which when disabled will bypass all of the congestion control Kconfig options and leave the user with a safe default. That safe default is currently BIC-TCP with new Reno as a fallback. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/Kconfig20
1 files changed, 19 insertions, 1 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 7bcfb84126d1..347083433120 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -445,9 +445,22 @@ config IP_TCPDIAG
445config IP_TCPDIAG_IPV6 445config IP_TCPDIAG_IPV6
446 def_bool (IP_TCPDIAG=y && IPV6=y) || (IP_TCPDIAG=m && IPV6) 446 def_bool (IP_TCPDIAG=y && IPV6=y) || (IP_TCPDIAG=m && IPV6)
447 447
448config TCP_CONG_ADVANCED
449 bool "TCP: advanced congestion control"
450 depends on INET
451 default y
452 ---help---
453 Support for selection of various TCP congestion control
454 modules.
455
456 Nearly all users can safely say no here, and a safe default
457 selection will be made (BIC-TCP with new Reno as a fallback).
458
459 If unsure, say N.
460
448# TCP Reno is builtin (required as fallback) 461# TCP Reno is builtin (required as fallback)
449menu "TCP congestion control" 462menu "TCP congestion control"
450 depends on INET 463 depends on TCP_CONG_ADVANCED
451 464
452config TCP_CONG_BIC 465config TCP_CONG_BIC
453 tristate "Binary Increase Congestion (BIC) control" 466 tristate "Binary Increase Congestion (BIC) control"
@@ -535,5 +548,10 @@ config TCP_CONG_SCALABLE
535 548
536endmenu 549endmenu
537 550
551config TCP_CONG_BIC
552 boolean
553 depends on !TCP_CONG_ADVANCED
554 default y
555
538source "net/ipv4/ipvs/Kconfig" 556source "net/ipv4/ipvs/Kconfig"
539 557