Merge branch 'linus' into cont_syslog

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

diff --git a/net/sctp/Kconfig b/net/sctp/Kconfig
index 58b3e88..126b014 100644 (file)
--- a/net/sctp/Kconfig
+++ b/net/sctp/Kconfig
@@ -37,6 +37,18 @@ menuconfig IP_SCTP
 
 if IP_SCTP
 
+config NET_SCTPPROBE
+       tristate "SCTP: Association probing"
+        depends on PROC_FS && KPROBES
+        ---help---
+        This module allows for capturing the changes to SCTP association
+        state in response to incoming packets. It is used for debugging
+        SCTP congestion control algorithms. If you don't understand
+        what was just said, you don't need it: say N.
+
+        To compile this code as a module, choose M here: the
+        module will be called sctp_probe.
+
 config SCTP_DBG_MSG
        bool "SCTP: Debug messages"
        help