From e2a99a3646e89fda523bcd9eadb9ea2bc24bc533 Mon Sep 17 00:00:00 2001 From: John Heffner Date: Tue, 29 Apr 2008 03:13:52 -0700 Subject: [PATCH] --- yaml --- r: 95383 b: refs/heads/master c: 246eb2af060fc32650f07203c02bdc0456ad76c7 h: refs/heads/master i: 95381: 7ce9ce451cce168478959d1199ed0b542d4f8b01 95379: f2accd104a92def46948443333f50b3798dbe433 95375: 760e9a22f12e8830ef6370f546dee226789e2144 v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_cong.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e9e730586780..9f9b258cbebe 100644 --- 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 index bfb1996bd99f..6a250828b767 100644 --- 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); }