SUNRPC: Fix the return value in gss_import_sec_context()

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

diff --git a/net/dccp/Kconfig b/net/dccp/Kconfig
index 24a6981..ad6dffd 100644 (file)
--- a/net/dccp/Kconfig
+++ b/net/dccp/Kconfig
@@ -1,54 +1,60 @@
-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
+         Datagram Congestion Control Protocol (RFC 4340)
 
-         From draft-ietf-dccp-spec-11 <http://www.icir.org/kohler/dcp/draft-ietf-dccp-spec-11.txt>.
+         From http://www.ietf.org/rfc/rfc4340.txt:
 
          The Datagram Congestion Control Protocol (DCCP) is a transport
          protocol that implements bidirectional, unicast connections of
          congestion-controlled, unreliable datagrams. It should be suitable
          for use by applications such as streaming media, Internet telephony,
-         and on-line games
+         and on-line games.
 
          To compile this protocol support as a module, choose M here: the
          module will be called 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
-       def_bool N
-
 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 IP_DCCP_UNLOAD_HACK
-       depends on IP_DCCP=m && IP_DCCP_CCID3=m
-       bool "DCCP control sock unload hack"
+config NET_DCCPPROBE
+       tristate "DCCP connection probing"
+       depends on PROC_FS && KPROBES
        ---help---
-         Enable this to be able to unload the dccp module when the it
-         has only one refcount held, the control sock one. Just execute
-         "rmmod dccp_ccid3 dccp"
+       This module allows for capturing the changes to DCCP connection
+       state in response to incoming packets. It is used for debugging
+       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 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
+       module will be called dccp_probe.
 
-         Just say N.
-endmenu
 
 endmenu
+
+endif # IP_DDCP