From e7dab1c7cb6bbd60432fb9bf16af7be8af4d45c2 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Mon, 20 Mar 2006 19:24:22 -0800 Subject: [PATCH] --- yaml --- r: 22204 b: refs/heads/master c: 057fc6755a2381b4e81636659ef519e069f38623 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/dccp/ccids/Kconfig | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3bfdf2ab83f9..6c6bf4bb48eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93ce20928f6e197707add8f670ae0cd029107e8f +refs/heads/master: 057fc6755a2381b4e81636659ef519e069f38623 diff --git a/trunk/net/dccp/ccids/Kconfig b/trunk/net/dccp/ccids/Kconfig index 422af197171d..ca00191628f7 100644 --- a/trunk/net/dccp/ccids/Kconfig +++ b/trunk/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