diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-30 09:52:20 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-30 09:52:20 +0100 |
| commit | c2d9b8387bce8b4a0fd402fab7dc1319d11a418d (patch) | |
| tree | 082cf7dd287f61635198011e61c3de1be130cc42 /net/ipv4/Kconfig | |
| parent | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (diff) | |
| parent | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff) | |
| download | talos-op-linux-c2d9b8387bce8b4a0fd402fab7dc1319d11a418d.tar.gz talos-op-linux-c2d9b8387bce8b4a0fd402fab7dc1319d11a418d.zip | |
Automerge with /usr/src/ntfs-2.6.git.
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 347083433120..3e63123f7bbd 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 |
