---

yaml --- r: 122544 b: refs/heads/master c: a2acde0 h: refs/heads/master v: v3
git-mirror · Dec 6, 2008 · 46b74b1 · 46b74b1
1 parent 617b828
commit 46b74b1
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: d5dd9175bc12015ea4d2c1a9b6b15dfa645a3db9
+refs/heads/master: a2acde07711f7d8b19928245c555bce60f91482a
diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c
@@ -1334,7 +1334,7 @@ static int tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb)
 
 	/* Defer for less than two clock ticks. */
 	if (tp->tso_deferred &&
-	    ((jiffies << 1) >> 1) - (tp->tso_deferred >> 1) > 1)
+	    (((u32)jiffies << 1) >> 1) - (tp->tso_deferred >> 1) > 1)
 		goto send_now;
 
 	in_flight = tcp_packets_in_flight(tp);