nfsd4: set shorter timeout

[safe/jmp/linux-2.6] / net / dccp / Kconfig

diff --git a/net/dccp/Kconfig b/net/dccp/Kconfig
index ef8919c..ad6dffd 100644 (file)
--- a/net/dccp/Kconfig
+++ b/net/dccp/Kconfig
@@ -1,8 +1,6 @@
-menu "DCCP Configuration (EXPERIMENTAL)"
-       depends on INET && EXPERIMENTAL
-
-config IP_DCCP
+menuconfig IP_DCCP
        tristate "The DCCP Protocol (EXPERIMENTAL)"
+       depends on INET && EXPERIMENTAL
        ---help---
          Datagram Congestion Control Protocol (RFC 4340)
 
@@ -19,25 +17,26 @@ config IP_DCCP
 
          If in doubt, say N.
 
+if IP_DCCP
+
 config INET_DCCP_DIAG
-       depends on IP_DCCP && INET_DIAG
+       depends on INET_DIAG
        def_tristate y if (IP_DCCP = y && INET_DIAG = y)
        def_tristate m
 
-config IP_DCCP_ACKVEC
-       depends on IP_DCCP
-       bool
-
 source "net/dccp/ccids/Kconfig"
 
 menu "DCCP Kernel Hacking"
-       depends on IP_DCCP && DEBUG_KERNEL=y
+       depends on DEBUG_KERNEL=y
 
 config IP_DCCP_DEBUG
        bool "DCCP debug messages"
        ---help---
          Only use this if you're hacking DCCP.
 
+         When compiling DCCP as a module, this debugging output can be toggled
+         by setting the parameter dccp_debug of the `dccp' module to 0 or 1.
+
          Just say N.
 
 config NET_DCCPPROBE
@@ -49,7 +48,7 @@ config NET_DCCPPROBE
        DCCP congestion avoidance modules. If you don't understand
        what was just said, you don't need it: say N.
 
-       Documentation on how to use the packet generator can be found
+       Documentation on how to use DCCP connection probing can be found
        at http://linux-net.osdl.org/index.php/DccpProbe
 
        To compile this code as a module, choose M here: the
@@ -58,4 +57,4 @@ config NET_DCCPPROBE
 
 endmenu
 
-endmenu
+endif # IP_DDCP