Commit a6484045 authored by David S. Miller's avatar David S. Miller

[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: default avatarDavid S. Miller <davem@davemloft.net>
parent bb298ca3
...@@ -445,9 +445,22 @@ config IP_TCPDIAG ...@@ -445,9 +445,22 @@ config IP_TCPDIAG
config IP_TCPDIAG_IPV6 config IP_TCPDIAG_IPV6
def_bool (IP_TCPDIAG=y && IPV6=y) || (IP_TCPDIAG=m && IPV6) def_bool (IP_TCPDIAG=y && IPV6=y) || (IP_TCPDIAG=m && IPV6)
config TCP_CONG_ADVANCED
bool "TCP: advanced congestion control"
depends on INET
default y
---help---
Support for selection of various TCP congestion control
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).
If unsure, say N.
# TCP Reno is builtin (required as fallback) # TCP Reno is builtin (required as fallback)
menu "TCP congestion control" menu "TCP congestion control"
depends on INET depends on TCP_CONG_ADVANCED
config TCP_CONG_BIC config TCP_CONG_BIC
tristate "Binary Increase Congestion (BIC) control" tristate "Binary Increase Congestion (BIC) control"
...@@ -535,5 +548,10 @@ config TCP_CONG_SCALABLE ...@@ -535,5 +548,10 @@ config TCP_CONG_SCALABLE
endmenu endmenu
config TCP_CONG_BIC
boolean
depends on !TCP_CONG_ADVANCED
default y
source "net/ipv4/ipvs/Kconfig" source "net/ipv4/ipvs/Kconfig"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment