---

yaml --- r: 134975 b: refs/heads/master c: 62ad276 h: refs/heads/master i: 134973: 5e165da 134971: 917162f 134967: b2cd29b 134959: 01c8548 134943: 3a14e98 134911: f503982 v: v3
git-mirror · Mar 2, 2009 · 6f11aec · 6f11aec
1 parent 88378ce
commit 6f11aec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59a08cba6a604a265e45e9b970e372554cf46627
+refs/heads/master: 62ad27619cbcf23fb8581ae72f3806c1d90a861d
diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c
@@ -1356,6 +1356,10 @@ static int tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb)
 	if (limit >= sk->sk_gso_max_size)
 		goto send_now;
 
+	/* Middle in queue won't get any more data, full sendable already? */
+	if ((skb != tcp_write_queue_tail(sk)) && (limit >= skb->len))
+		goto send_now;
+
 	if (sysctl_tcp_tso_win_divisor) {
 		u32 chunk = min(tp->snd_wnd, tp->snd_cwnd * tp->mss_cache);