summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulian Wollrath <jwollrath@web.de>2016-11-25 15:05:26 +0100
committerDavid S. Miller <davem@davemloft.net>2016-11-28 18:15:00 +0100
commit4df21dfcf2291865cf673ac786a81c7a3f7afcf5 (patch)
tree7473c76a3da4a24d623c524decdb140f0514edeb
parentMerge branch 'fix-RTL8211F-TX-delay-handling' (diff)
downloadlinux-4df21dfcf2291865cf673ac786a81c7a3f7afcf5.tar.xz
linux-4df21dfcf2291865cf673ac786a81c7a3f7afcf5.zip
tcp: Set DEFAULT_TCP_CONG to bbr if DEFAULT_BBR is set
Signed-off-by: Julian Wollrath <jwollrath@web.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 300b06888fdf..b54b3ca939db 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -715,6 +715,7 @@ config DEFAULT_TCP_CONG
default "reno" if DEFAULT_RENO
default "dctcp" if DEFAULT_DCTCP
default "cdg" if DEFAULT_CDG
+ default "bbr" if DEFAULT_BBR
default "cubic"
config TCP_MD5SIG