diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-25 17:39:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-25 17:39:55 -0700 |
commit | 7e4720201ad44ace85a443f41d668a62a737e7d0 (patch) | |
tree | 8b9118dffcfd9511d9ce31b87776e04095f9acf1 /net/dccp/Kconfig | |
parent | 7b29122f9ec54db5c38a66a11127d94db0817c17 (diff) | |
parent | 4cc6773508299377099aa30cf30e6a2196c5872d (diff) | |
download | blackbird-op-linux-7e4720201ad44ace85a443f41d668a62a737e7d0.tar.gz blackbird-op-linux-7e4720201ad44ace85a443f41d668a62a737e7d0.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NetLabel]: update docs with website information
[NetLabel]: rework the Netlink attribute handling (part 2)
[NetLabel]: rework the Netlink attribute handling (part 1)
[Netlink]: add nla_validate_nested()
[NETLINK]: add nla_for_each_nested() to the interface list
[NetLabel]: change the SELinux permissions
[NetLabel]: make the CIPSOv4 cache spinlocks bottom half safe
[NetLabel]: correct improper handling of non-NetLabel peer contexts
[TCP]: make cubic the default
[TCP]: default congestion control menu
[ATM] he: Fix __init/__devinit conflict
[NETFILTER]: Add dscp,DSCP headers to header-y
[DCCP]: Introduce dccp_probe
[DCCP]: Use constants for CCIDs
[DCCP]: Introduce constants for CCID numbers
[DCCP]: Allow default/fallback service code.
Diffstat (limited to 'net/dccp/Kconfig')
-rw-r--r-- | net/dccp/Kconfig | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/net/dccp/Kconfig b/net/dccp/Kconfig index 859e3359fcda..e2a095d0fd80 100644 --- a/net/dccp/Kconfig +++ b/net/dccp/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 |