diff --git a/[refs] b/[refs] index d6fe339e34a5..139cd696d451 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 760df93ecdd59fc1c213a491b5adee79f53606da +refs/heads/master: 45dad7bd9d9b65a30d6e790b111f6f2d8f746d22 diff --git a/trunk/Documentation/sysctl/net.txt b/trunk/Documentation/sysctl/net.txt index 995c2257b3e7..a34d55b65441 100644 --- a/trunk/Documentation/sysctl/net.txt +++ b/trunk/Documentation/sysctl/net.txt @@ -93,8 +93,9 @@ of struct cmsghdr structures with appended data. 2. /proc/sys/net/unix - Parameters for Unix domain sockets ------------------------------------------------------- -There are only two files in this subdirectory. They control the delays for -deleting and destroying socket descriptors. +There is only one file in this directory. +unix_dgram_qlen limits the max number of datagrams queued in Unix domain +socket's buffer. It will not take effect unless PF_UNIX flag is spicified. 3. /proc/sys/net/ipv4 - IPV4 settings