Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / Documentation / networking / dccp.txt

diff --git a/Documentation/networking/dccp.txt b/Documentation/networking/dccp.txt
index fc8b4fa0b14104a8780af2da082fa67badb70f5b..afb66f9a8aff5aa3f32ea32ea65784ac80d6131e 100644 (file)
--- a/Documentation/networking/dccp.txt
+++ b/Documentation/networking/dccp.txt
@@ -55,12 +55,13 @@ be enabled at the receiver, too with suitable choice of CsCov.
 DCCP_SOCKOPT_SEND_CSCOV sets the sender checksum coverage. Values in the
        range 0..15 are acceptable. The default setting is 0 (full coverage),
        values between 1..15 indicate partial coverage.
-DCCP_SOCKOPT_SEND_CSCOV is for the receiver and has a different meaning: it
+DCCP_SOCKOPT_RECV_CSCOV is for the receiver and has a different meaning: it
        sets a threshold, where again values 0..15 are acceptable. The default
        of 0 means that all packets with a partial coverage will be discarded.
        Values in the range 1..15 indicate that packets with minimally such a
        coverage value are also acceptable. The higher the number, the more
-       restrictive this setting (see [RFC 4340, sec. 9.2.1]).
+       restrictive this setting (see [RFC 4340, sec. 9.2.1]). Partial coverage
+       settings are inherited to the child socket after accept().
 
 The following two options apply to CCID 3 exclusively and are getsockopt()-only.
 In either case, a TFRC info struct (defined in <linux/tfrc.h>) is returned.