From 39d6cb6c46a2929fa773f971811e907473bbd789 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 23 Aug 2005 10:13:06 -0700
Subject: [PATCH] --- yaml --- r: 5929 b: refs/heads/master c:
 89ebd197eb2cd31d6187db344d5117064e19fdde h: refs/heads/master i:   5927:
 0f9ee6264dc415ad8e6e65300ba55aef862c63ab v: v3

---
 [refs]               | 2 +-
 trunk/net/ipv4/tcp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1cf5d9befa6f..3e076cc9dc3b 100644
--- 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
index ddb6ce4ecff2..69b1fcf70077 100644
--- 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; 
 }