From: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Date: Fri, 21 Dec 2007 04:36:03 +0000 (-0800)
Subject: [TCP]: Fix TSO deferring
X-Git-Tag: MMI-PSA29.97-13-9~37648^2~959
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bd515c3e48ececd774eb3128e81b669dbbd32637;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

[TCP]: Fix TSO deferring

I'd say that most of what tcp_tso_should_defer had in between
there was dead code because of this.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 9a985b55e7d8..7c50271ddc30 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1230,7 +1230,8 @@ static int tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb)
 		goto send_now;
 
 	/* Defer for less than two clock ticks. */
-	if (!tp->tso_deferred && ((jiffies<<1)>>1) - (tp->tso_deferred>>1) > 1)
+	if (tp->tso_deferred &&
+	    ((jiffies << 1) >> 1) - (tp->tso_deferred >> 1) > 1)
 		goto send_now;
 
 	in_flight = tcp_packets_in_flight(tp);