diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-06 08:11:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-06 08:11:33 +0100 |
| commit | 7119a341f35b0a3ddcf426818267980057c770a1 (patch) | |
| tree | 37e3b68d02bfc6f7759bf711e00d612ba86865b5 /net/ipv4/tcp_output.c | |
| parent | 87cdee71166fa107c5dc8e43060eeefa533c6a3b (diff) | |
| parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) | |
Merge commit 'v3.2-rc4' into core/locking
Merge reason: Pick up post-rc1 fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 980b98f6288c..63170e297540 100644 --- a/net/ipv4/tcp_output.c +++ b/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. */ |