[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>

diff --git a/net/dccp/ccids/Kconfig b/net/dccp/ccids/Kconfig
index 422af197171dc9bce8886755d56690730fb33255..ca00191628f79d98215219a9cca77310c7420dc5 100644 (file)
--- 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