---

yaml --- r: 95383 b: refs/heads/master c: 246eb2a h: refs/heads/master i: 95381: 7ce9ce4 95379: f2accd1 95375: 760e9a2 v: v3
git-mirror · Apr 29, 2008 · e2a99a3 · e2a99a3
1 parent a6152d2
commit e2a99a3
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: ce447eb91409225f8a488f6b7b2a1bdf7b2d884f
+refs/heads/master: 246eb2af060fc32650f07203c02bdc0456ad76c7
diff --git a/trunk/net/ipv4/tcp_cong.c b/trunk/net/ipv4/tcp_cong.c
@@ -287,7 +287,8 @@ int tcp_is_cwnd_limited(const struct sock *sk, u32 in_flight)
 
 	left = tp->snd_cwnd - in_flight;
 	if (sk_can_gso(sk) &&
-	    left * sysctl_tcp_tso_win_divisor < tp->snd_cwnd)
+	    left * sysctl_tcp_tso_win_divisor < tp->snd_cwnd &&
+	    left * tp->mss_cache < sk->sk_gso_max_size)
 		return 1;
 	return left <= tcp_max_burst(tp);
 }