diff --git a/[refs] b/[refs] index 9834ff732dae..f63aa09f3c09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a02ba041664171563e6418ccdf3b363d32d6a43b +refs/heads/master: 2ff011efa4cc591ed563241bae3d60bc0eaac210 diff --git a/trunk/net/ipv4/Kconfig b/trunk/net/ipv4/Kconfig index c68196cc56ab..719c1040bd0a 100644 --- a/trunk/net/ipv4/Kconfig +++ b/trunk/net/ipv4/Kconfig @@ -577,6 +577,7 @@ config TCP_CONG_VENO config TCP_CONG_YEAH tristate "YeAH TCP" depends on EXPERIMENTAL + select TCP_CONG_VEGAS default n ---help--- YeAH-TCP is a sender-side high-speed enabled TCP congestion control