From ca59633ceb0b1d32415e1bfafed28e1816ddd47e Mon Sep 17 00:00:00 2001 From: Vijay Subramanian Date: Wed, 9 Jan 2013 12:21:30 +0000 Subject: [PATCH] --- yaml --- r: 351338 b: refs/heads/master c: 3d55b323709661df34d93e4cdcc5337620e34dfd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/networking/ip-sysctl.txt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c590b7cc14b4..861cacd9efa4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 238268503f306cdc435eff2181e38c08ce412ed5 +refs/heads/master: 3d55b323709661df34d93e4cdcc5337620e34dfd diff --git a/trunk/Documentation/networking/ip-sysctl.txt b/trunk/Documentation/networking/ip-sysctl.txt index dd52d516cb89..51dcd52a91c4 100644 --- a/trunk/Documentation/networking/ip-sysctl.txt +++ b/trunk/Documentation/networking/ip-sysctl.txt @@ -214,8 +214,9 @@ tcp_ecn - INTEGER congestion before having to drop packets. 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 + 1 Enable ECN when requested by incoming connections and + also request ECN on outgoing connection attempts. + 2 Enable ECN when requested by incoming connections but do not request ECN on outgoing connections. Default: 2