---

yaml --- r: 78589 b: refs/heads/master c: bd515c3 h: refs/heads/master i: 78587: 2477568 v: v3
git-mirror · Jan 28, 2008 · bcd55a4 · bcd55a4
1 parent a818dee
commit bcd55a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 255f97b3117cbe10b2493f7f12d66a81dfbcdf43
+refs/heads/master: bd515c3e48ececd774eb3128e81b669dbbd32637
diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/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);