summaryrefslogtreecommitdiffstats
path: root/net/dccp
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2006-03-21 04:24:22 +0100
committerDavid S. Miller <davem@davemloft.net>2006-03-21 04:24:22 +0100
commit057fc6755a2381b4e81636659ef519e069f38623 (patch)
treee15ad08e84e0892e1bb273067fd7e6f20a62fdad /net/dccp
parent[DCCP]: Make CCID2 be the default (diff)
downloadlinux-057fc6755a2381b4e81636659ef519e069f38623.tar.xz
linux-057fc6755a2381b4e81636659ef519e069f38623.zip
[DCCP]: Kconfig tidy up
Make CCID2 and CCID3 default to what was selected for DCCP and use the standard short description for the CCIDs (TCP-Like & TCP-Friendly). Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
-rw-r--r--net/dccp/ccids/Kconfig6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/dccp/ccids/Kconfig b/net/dccp/ccids/Kconfig
index 422af197171d..ca00191628f7 100644
--- a/net/dccp/ccids/Kconfig
+++ b/net/dccp/ccids/Kconfig
@@ -2,8 +2,9 @@ menu "DCCP CCIDs Configuration (EXPERIMENTAL)"
depends on IP_DCCP && EXPERIMENTAL
config IP_DCCP_CCID2
- tristate "CCID2 (TCP) (EXPERIMENTAL)"
+ tristate "CCID2 (TCP-Like) (EXPERIMENTAL)"
depends on IP_DCCP
+ def_tristate IP_DCCP
select IP_DCCP_ACKVEC
---help---
CCID 2, TCP-like Congestion Control, denotes Additive Increase,
@@ -30,8 +31,9 @@ config IP_DCCP_CCID2
If in doubt, say M.
config IP_DCCP_CCID3
- tristate "CCID3 (TFRC) (EXPERIMENTAL)"
+ tristate "CCID3 (TCP-Friendly) (EXPERIMENTAL)"
depends on IP_DCCP
+ def_tristate IP_DCCP
---help---
CCID 3 denotes TCP-Friendly Rate Control (TFRC), an equation-based
rate-controlled congestion control mechanism. TFRC is designed to