---

yaml --- r: 361833 b: refs/heads/master c: f4541d6 h: refs/heads/master i: 361831: c85c5f9 v: v3
git-mirror · Mar 22, 2013 · 4c0e08a · 4c0e08a
1 parent 87a01d6
commit 4c0e08a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae5fc98728c8bbbd6d7cab0b9781671fc4419c1b
+refs/heads/master: f4541d60a449afd40448b06496dcd510f505928e
diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c
@@ -1809,8 +1809,11 @@ static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb)
 			goto send_now;
 	}
 
-	/* Ok, it looks like it is advisable to defer.  */
-	tp->tso_deferred = 1 | (jiffies << 1);
+	/* Ok, it looks like it is advisable to defer.
+	 * Do not rearm the timer if already set to not break TCP ACK clocking.
+	 */
+	if (!tp->tso_deferred)
+		tp->tso_deferred = 1 | (jiffies << 1);
 
 	return true;