diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-09-24 19:29:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-24 19:29:57 -0700 |
| commit | 76a081e5b32fde17f6f6d007e1806744cc848712 (patch) | |
| tree | 869a5a0c406fbc71ffb803f57aad147014510f27 /Documentation | |
| parent | 0d6c7ae22d4fadbc83677ea1a6144eea8911e319 (diff) | |
| parent | e41542f5167d6b506607f8dd111fa0a3e468ccb8 (diff) | |
| download | linux-76a081e5b32fde17f6f6d007e1806744cc848712.tar.gz linux-76a081e5b32fde17f6f6d007e1806744cc848712.tar.bz2 linux-76a081e5b32fde17f6f6d007e1806744cc848712.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/dccp.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/networking/dccp.txt b/Documentation/networking/dccp.txt index c45daabd3bfe..74563b38ffd9 100644 --- a/Documentation/networking/dccp.txt +++ b/Documentation/networking/dccp.txt @@ -1,7 +1,6 @@ DCCP protocol ============ -Last updated: 10 November 2005 Contents ======== @@ -42,8 +41,11 @@ Socket options DCCP_SOCKOPT_PACKET_SIZE is used for CCID3 to set default packet size for calculations. -DCCP_SOCKOPT_SERVICE sets the service. This is compulsory as per the -specification. If you don't set it you will get EPROTO. +DCCP_SOCKOPT_SERVICE sets the service. The specification mandates use of +service codes (RFC 4340, sec. 8.1.2); if this socket option is not set, +the socket will fall back to 0 (which means that no meaningful service code +is present). Connecting sockets set at most one service option; for +listening sockets, multiple service codes can be specified. Notes ===== |