summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorJohn Heffner2008-04-29 12:13:52 +0200
committerDavid S. Miller2008-04-29 12:13:52 +0200
commit246eb2af060fc32650f07203c02bdc0456ad76c7 (patch)
treeaea2a9d4e65331edb6355fb4fed27b73a02d6e28 /net/ipv4
parenttcp: Allow send-limited cwnd to grow up to max_burst when gso disabled (diff)
downloadkernel-qcow2-linux-246eb2af060fc32650f07203c02bdc0456ad76c7.tar.gz
kernel-qcow2-linux-246eb2af060fc32650f07203c02bdc0456ad76c7.tar.xz
kernel-qcow2-linux-246eb2af060fc32650f07203c02bdc0456ad76c7.zip
tcp: Limit cwnd growth when deferring for GSO
This fixes inappropriately large cwnd growth on sender-limited flows when GSO is enabled, limiting cwnd growth to 64k. Signed-off-by: John Heffner <johnwheffner@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/tcp_cong.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c
index bfb1996bd99f..6a250828b767 100644
--- a/net/ipv4/tcp_cong.c
+++ b/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);
}