---

yaml --- r: 275659 b: refs/heads/master c: 6d67e9b h: refs/heads/master i: 275657: 2032d26 275655: 050f9fd v: v3
git-mirror · Nov 8, 2011 · ab3eb22 · ab3eb22
1 parent 2560cb5
commit ab3eb22
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59caa5612ce916c4902c753aa61429eb76ac2b21
+refs/heads/master: 6d67e9beb68bc6712b042c9723cecc87dc8e3f4c
diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c
@@ -1382,7 +1382,7 @@ static inline int tcp_minshall_check(const struct tcp_sock *tp)
 /* Return 0, if packet can be sent now without violation Nagle's rules:
  * 1. It is full sized.
  * 2. Or it contains FIN. (already checked by caller)
- * 3. Or TCP_NODELAY was set.
+ * 3. Or TCP_CORK is not set, and TCP_NODELAY is set.
  * 4. Or TCP_CORK is not set, and all sent packets are ACKed.
  *    With Minshall's modification: all sent small packets are ACKed.
  */