summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Heffner <johnwheffner@gmail.com>2008-04-29 03:13:02 -0700
committerDavid S. Miller <davem@davemloft.net>2008-04-29 03:13:02 -0700
commitce447eb91409225f8a488f6b7b2a1bdf7b2d884f (patch)
treee47dc116d1ba834c9a568133cfb7855bdb493950
parentd0313587547092af7f5ee8a576793e1e5d61be89 (diff)
downloadlinux-ce447eb91409225f8a488f6b7b2a1bdf7b2d884f.tar.gz
linux-ce447eb91409225f8a488f6b7b2a1bdf7b2d884f.tar.bz2
linux-ce447eb91409225f8a488f6b7b2a1bdf7b2d884f.zip
tcp: Allow send-limited cwnd to grow up to max_burst when gso disabled
This changes the logic in tcp_is_cwnd_limited() so that cwnd may grow up to tcp_max_burst() even when sk_can_gso() is false, or when sysctl_tcp_tso_win_divisor != 0. Signed-off-by: John Heffner <johnwheffner@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/tcp_cong.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c
index 3a6be23d222f..bfb1996bd99f 100644
--- a/net/ipv4/tcp_cong.c
+++ b/net/ipv4/tcp_cong.c
@@ -285,14 +285,11 @@ int tcp_is_cwnd_limited(const struct sock *sk, u32 in_flight)
if (in_flight >= tp->snd_cwnd)
return 1;
- if (!sk_can_gso(sk))
- return 0;
-
left = tp->snd_cwnd - in_flight;
- if (sysctl_tcp_tso_win_divisor)
- return left * sysctl_tcp_tso_win_divisor < tp->snd_cwnd;
- else
- return left <= tcp_max_burst(tp);
+ if (sk_can_gso(sk) &&
+ left * sysctl_tcp_tso_win_divisor < tp->snd_cwnd)
+ return 1;
+ return left <= tcp_max_burst(tp);
}
EXPORT_SYMBOL_GPL(tcp_is_cwnd_limited);