X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=net%2Fipv4%2Ftcp.c;h=69b1fcf70077262e39737ce5f87bb8effb1e85e9;hb=739cdbf1d8f0739b80035b80d69d871e33749b86;hp=ddb6ce4ecff291e9ecec53e86a2781eefe61a3bb;hpb=8066eff0a1a0703ad901dbe5646a47dbfc089ef2;p=linux-2.6

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index ddb6ce4ecf..69b1fcf700 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -584,7 +584,7 @@ static inline void skb_entail(struct sock *sk, struct tcp_sock *tp,
 	sk_charge_skb(sk, skb);
 	if (!sk->sk_send_head)
 		sk->sk_send_head = skb;
-	else if (tp->nonagle&TCP_NAGLE_PUSH)
+	if (tp->nonagle & TCP_NAGLE_PUSH)
 		tp->nonagle &= ~TCP_NAGLE_PUSH; 
 }