3 files changed, 12 insertions, 13 deletions

diff --git a/Documentation/networking/dccp.txt b/Documentation/networking/dccp.txt
index fdc93beec057..ffb9ca937d65 100644
--- a/Documentation/networking/dccp.txt
+++ b/Documentation/networking/dccp.txt
@@ -14,8 +14,15 @@ Introduction
 ============
 
 Datagram Congestion Control Protocol (DCCP) is an unreliable, connection
-based protocol designed to solve issues present in UDP and TCP particularly
-for real time and multimedia traffic.
+oriented protocol designed to solve issues present in UDP and TCP, particularly
+for real-time and multimedia (streaming) traffic.
+It divides into a base protocol (RFC 4340) and plugable congestion control
+modules called CCIDs. Like plugable TCP congestion control, at least one CCID
+needs to be enabled in order for the protocol to function properly. In the Linux
+implementation, this is the TCP-like CCID2 (RFC 4341). Additional CCIDs, such as
+the TCP-friendly CCID3 (RFC 4342), are optional.
+For a brief introduction to CCIDs and suggestions for choosing a CCID to match
+given applications, see section 10 of RFC 4340.
 
 It has a base protocol and pluggable congestion control IDs (CCIDs).
 
diff --git a/net/dccp/Kconfig b/net/dccp/Kconfig
index 0549e4719b13..7aa2a7acc7ec 100644
--- a/net/dccp/Kconfig
+++ b/net/dccp/Kconfig
@@ -1,6 +1,7 @@
 menuconfig IP_DCCP
         tristate "The DCCP Protocol (EXPERIMENTAL)"
         depends on INET && EXPERIMENTAL
+        select IP_DCCP_CCID2
         ---help---
           Datagram Congestion Control Protocol (RFC 4340)
 
diff --git a/net/dccp/ccids/Kconfig b/net/dccp/ccids/Kconfig
index 80f469887691..f37af17556ba 100644
--- a/net/dccp/ccids/Kconfig
+++ b/net/dccp/ccids/Kconfig
@@ -20,18 +20,9 @@ config IP_DCCP_CCID2
           to the user.  For example, a hypothetical application that
           transferred files over DCCP, using application-level retransmissions
           for lost packets, would prefer CCID 2 to CCID 3.  On-line games may
-          also prefer CCID 2.
+          also prefer CCID 2.  See RFC 4341 for further details.
 
-          CCID 2 is further described in RFC 4341,
-          http://www.ietf.org/rfc/rfc4341.txt
-
-          This text was extracted from RFC 4340 (sec. 10.1),
-          http://www.ietf.org/rfc/rfc4340.txt
-
-          To compile this CCID as a module, choose M here: the module will be
-          called dccp_ccid2.
-
-          If in doubt, say M.
+          CCID2 is the default CCID used by DCCP.
 
 config IP_DCCP_CCID2_DEBUG
           bool "CCID2 debugging messages"