projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
52d3408
)
[TCP]: NAGLE_PUSH seems to be a wrong way around
author
Ilpo Järvinen
<ilpo.jarvinen@helsinki.fi>
Wed, 5 Dec 2007 10:25:32 +0000
(
02:25
-0800)
committer
David S. Miller
<davem@sunset.davemloft.net>
Wed, 5 Dec 2007 13:37:31 +0000
(
05:37
-0800)
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>
net/ipv4/tcp_output.c
patch
|
blob
|
history
diff --git
a/net/ipv4/tcp_output.c
b/net/ipv4/tcp_output.c
index
e5130a7
..
f4c1eef
100644
(file)
--- a/
net/ipv4/tcp_output.c
+++ b/
net/ipv4/tcp_output.c
@@
-1162,8
+1162,7
@@
int tcp_may_send_now(struct sock *sk)
return (skb &&
tcp_snd_test(sk, skb, tcp_current_mss(sk, 1),
(tcp_skb_is_last(sk, skb) ?
- TCP_NAGLE_PUSH :
- tp->nonagle)));
+ tp->nonagle : TCP_NAGLE_PUSH)));
}
/* Trim TSO SKB to LEN bytes, put the remaining data into a new packet