diff options
| author | Feng King <kinwin2008@gmail.com> | 2011-11-05 05:23:23 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-08 20:02:47 +0100 |
| commit | 6d67e9beb68bc6712b042c9723cecc87dc8e3f4c (patch) | |
| tree | a9cb7bdc4ed3a2a0a17948597e987ead64f08f13 /net/ipv4/tcp_output.c | |
| parent | sunhme: Allow usage on SBI based SBus systems (diff) | |
| download | linux-6d67e9beb68bc6712b042c9723cecc87dc8e3f4c.tar.xz linux-6d67e9beb68bc6712b042c9723cecc87dc8e3f4c.zip | |
tcp: Fix comments for Nagle algorithm
TCP_NODELAY is weaker than TCP_CORK, when TCP_CORK was set, small
segments will always pass Nagle test regardless of TCP_NODELAY option.
Signed-off-by: Feng King <kinwin2008@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -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. */ |