summaryrefslogtreecommitdiffstats
path: root/Documentation/networking
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-26 19:13:19 +0200
committerJeff Garzik <jeff@garzik.org>2006-09-26 19:13:19 +0200
commitc226951b93f7cd7c3a10b17384535b617bd43fd0 (patch)
tree07b8796a5c99fbbf587b8d0dbcbc173cfe5e381e /Documentation/networking
parentMerge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linv... (diff)
parent[PATCH] s390: fix cmm kernel thread handling (diff)
downloadlinux-c226951b93f7cd7c3a10b17384535b617bd43fd0.tar.xz
linux-c226951b93f7cd7c3a10b17384535b617bd43fd0.zip
Merge branch 'master' into upstream
Diffstat (limited to 'Documentation/networking')
-rw-r--r--Documentation/networking/dccp.txt8
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
=====