Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[linux-2.6] / net / dccp / Kconfig

diff --git a/net/dccp/Kconfig b/net/dccp/Kconfig
index 7e096ba..e2a095d 100644 (file)
--- a/net/dccp/Kconfig
+++ b/net/dccp/Kconfig
@@ -26,7 +26,7 @@ config INET_DCCP_DIAG
 
 config IP_DCCP_ACKVEC
        depends on IP_DCCP
-       def_bool N
+       bool
 
 source "net/dccp/ccids/Kconfig"
 
@@ -40,6 +40,22 @@ config IP_DCCP_DEBUG
 
          Just say N.
 
+config NET_DCCPPROBE
+       tristate "DCCP connection probing"
+       depends on PROC_FS && KPROBES
+       ---help---
+       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 the packet generator 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.
+
+
 endmenu
 
 endmenu