---

yaml --- r: 351338 b: refs/heads/master c: 3d55b32 h: refs/heads/master v: v3
git-mirror · Jan 10, 2013 · ca59633 · ca59633
1 parent 2ec048e
commit ca59633
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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