diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 02:16:33 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 02:16:33 (GMT) |
| commit | 020f46a39eb7b99a575b9f4d105fce2b142acdf1 (patch) | |
| tree | 6abb47cdded94553adb31234bb277b8b5212873e /net/ipv4/Kconfig | |
| parent | 41b6c37326cb24efc86fba94bcaa37f2cc23f1cd (diff) | |
| parent | 4da62fc70d7cbcf8fa606a8c806d9dc8faa0ceae (diff) | |
| download | linux-020f46a39eb7b99a575b9f4d105fce2b142acdf1.tar.xz | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/Kconfig')
| -rw-r--r-- | net/ipv4/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 3470834..3e63123 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -448,7 +448,6 @@ config IP_TCPDIAG_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. @@ -549,7 +548,7 @@ config TCP_CONG_SCALABLE endmenu config TCP_CONG_BIC - boolean + tristate depends on !TCP_CONG_ADVANCED default y |