From ab3eb2226c5f7a50959ff609287f4d818e36f3d7 Mon Sep 17 00:00:00 2001 From: Feng King Date: Sat, 5 Nov 2011 04:23:23 +0000 Subject: [PATCH] --- yaml --- r: 275659 b: refs/heads/master c: 6d67e9beb68bc6712b042c9723cecc87dc8e3f4c h: refs/heads/master i: 275657: 2032d2670276ee569068e5e4b8b27c9aa8863dd7 275655: 050f9fd9bcd520f7d162d05dacd05d76c4722501 v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_output.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dedf23a27fe9..428d20e191cc 100644 --- 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 index 980b98f6288c..63170e297540 100644 --- 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. */