From ec991295b279c323d6e1be8e3d5dcc03c8fee10e Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Thu, 3 Jan 2013 07:50:29 +0000 Subject: [PATCH] --- yaml --- r: 348399 b: refs/heads/master c: 3b09adcb20c1e393a8721b1805f49dd8c1657563 h: refs/heads/master i: 348397: 31175c4cd8af8db8f7ef54307ef01307e0f51e27 348395: 5b0ddef419fec1b7d97eb58d7e9bc47539834ea3 348391: 6eceb8bc83c314257576c74cbcb6f009810becb6 348383: 93d9f031659e5beb0aa1a691e521911c07228a01 v: v3 --- [refs] | 2 +- trunk/Documentation/networking/ip-sysctl.txt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9f4f6e32d83c..1387c82c7631 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ff3fec6d3fc848753c2fa30b18607358f89a202 +refs/heads/master: 3b09adcb20c1e393a8721b1805f49dd8c1657563 diff --git a/trunk/Documentation/networking/ip-sysctl.txt b/trunk/Documentation/networking/ip-sysctl.txt index ac1710ef21af..dbca66182089 100644 --- a/trunk/Documentation/networking/ip-sysctl.txt +++ b/trunk/Documentation/networking/ip-sysctl.txt @@ -36,7 +36,7 @@ neigh/default/unres_qlen_bytes - INTEGER The maximum number of bytes which may be used by packets queued for each unresolved address by other network layers. (added in linux 3.3) - Seting negative value is meaningless and will retrun error. + Setting negative value is meaningless and will return error. Default: 65536 Bytes(64KB) neigh/default/unres_qlen - INTEGER @@ -215,7 +215,7 @@ tcp_ecn - INTEGER Possible values are: 0 Disable ECN. Neither initiate nor accept ECN. 1 Always request ECN on outgoing connection attempts. - 2 Enable ECN when requested by incomming connections + 2 Enable ECN when requested by incoming connections but do not request ECN on outgoing connections. Default: 2 @@ -503,7 +503,7 @@ tcp_fastopen - INTEGER tcp_syn_retries - INTEGER Number of times initial SYNs for an active TCP connection attempt will be retransmitted. Should not be higher than 255. Default value - is 6, which corresponds to 63seconds till the last restransmission + is 6, which corresponds to 63seconds till the last retransmission with the current initial RTO of 1second. With this the final timeout for an active TCP connection attempt will happen after 127seconds. @@ -1536,7 +1536,7 @@ cookie_hmac_alg - STRING * sha1 * none Ability to assign md5 or sha1 as the selected alg is predicated on the - configuarion of those algorithms at build time (CONFIG_CRYPTO_MD5 and + configuration of those algorithms at build time (CONFIG_CRYPTO_MD5 and CONFIG_CRYPTO_SHA1). Default: Dependent on configuration. MD5 if available, else SHA1 if @@ -1554,7 +1554,7 @@ rcvbuf_policy - INTEGER blocking. 1: rcvbuf space is per association - 0: recbuf space is per socket + 0: rcvbuf space is per socket Default: 0