diff options
| author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2007-12-05 05:25:32 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-12-05 08:37:31 -0500 |
| commit | 4e67d876ce07471e02be571038d5435a825f0215 (patch) | |
| tree | 99735632828d178f6dd9bc9d036b6879bcdcbebe | |
| parent | 52d3408150858a301a84bcbfe2f323d90d71d2ce (diff) | |
[TCP]: NAGLE_PUSH seems to be a wrong way around
The comment in tcp_nagle_test suggests that. This bug is very
very old, even 2.4.0 seems to have it.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/tcp_output.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index e5130a7fe181..f4c1eef89af0 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
| @@ -1162,8 +1162,7 @@ int tcp_may_send_now(struct sock *sk) | |||
| 1162 | return (skb && | 1162 | return (skb && |
| 1163 | tcp_snd_test(sk, skb, tcp_current_mss(sk, 1), | 1163 | tcp_snd_test(sk, skb, tcp_current_mss(sk, 1), |
| 1164 | (tcp_skb_is_last(sk, skb) ? | 1164 | (tcp_skb_is_last(sk, skb) ? |
| 1165 | TCP_NAGLE_PUSH : | 1165 | tp->nonagle : TCP_NAGLE_PUSH))); |
| 1166 | tp->nonagle))); | ||
| 1167 | } | 1166 | } |
| 1168 | 1167 | ||
| 1169 | /* Trim TSO SKB to LEN bytes, put the remaining data into a new packet | 1168 | /* Trim TSO SKB to LEN bytes, put the remaining data into a new packet |