From 048460264263cdc7fc34b585aa004e34f11a777a Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 24 Jun 2005 18:07:51 -0700
Subject: [PATCH] --- yaml --- r: 3185 b: refs/heads/master c:
 a6484045fdd4154f8c8ee8c1dda4e32854c047e0 h: refs/heads/master i:   3183:
 75a82d1cd7a8edd0169ce18978a0804abd26670d v: v3

---
 [refs]                 |  2 +-
 trunk/net/ipv4/Kconfig | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d337ffd9a755..a2aaca203aad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb298ca3ce92574d57c4e49b329421425ea7d279
+refs/heads/master: a6484045fdd4154f8c8ee8c1dda4e32854c047e0
diff --git a/trunk/net/ipv4/Kconfig b/trunk/net/ipv4/Kconfig
index 7bcfb84126d1..347083433120 100644
--- a/trunk/net/ipv4/Kconfig
+++ b/trunk/net/ipv4/Kconfig
@@ -445,9 +445,22 @@ config IP_TCPDIAG
 config IP_TCPDIAG_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)
 menu "TCP congestion control"
-	depends on INET
+	depends on TCP_CONG_ADVANCED
 
 config TCP_CONG_BIC
 	tristate "Binary Increase Congestion (BIC) control"
@@ -535,5 +548,10 @@ config TCP_CONG_SCALABLE
 
 endmenu
 
+config TCP_CONG_BIC
+	boolean
+	depends on !TCP_CONG_ADVANCED
+	default y
+
 source "net/ipv4/ipvs/Kconfig"