---

yaml --- r: 5929 b: refs/heads/master c: 89ebd19 h: refs/heads/master i: 5927: 0f9ee62 v: v3
git-mirror · Aug 23, 2005 · 39d6cb6 · 39d6cb6
1 parent 543930c
commit 39d6cb6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fbbeb1ba43bd04f0f1d4f161b7f72437a1c8a03
+refs/heads/master: 89ebd197eb2cd31d6187db344d5117064e19fdde
diff --git a/trunk/net/ipv4/tcp.c b/trunk/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; 
 }