diff options
| author | David S. Miller <davem@davemloft.net> | 2015-07-10 00:22:53 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-10 00:22:53 +0300 |
| commit | 986ca37eaedc9bc3045a91cc32e6e7427bd87b5d (patch) | |
| tree | db19bf4b5ef34ff71a94b9b50ac58875734fedd1 /net/ipv4/tcp_scalable.c | |
| parent | 1007f59dce53a22cba164f854d7bdc171c85dc79 (diff) | |
| parent | b20a3fa30a281b52b2576b509efbe5cd47a5a79b (diff) | |
| download | linux-986ca37eaedc9bc3045a91cc32e6e7427bd87b5d.tar.xz | |
Merge branch 'tcp-in-slow-start'
Yuchung Cheng says:
====================
tcp: fixes some congestion control corner cases
This patch series fixes corner cases of TCP congestion control.
First issue is to avoid continuing slow start when cwnd reaches ssthresh.
Second issue is incorrectly processing order of congestion state and
cwnd update when entering fast recovery or undoing cwnd.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_scalable.c')
| -rw-r--r-- | net/ipv4/tcp_scalable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_scalable.c b/net/ipv4/tcp_scalable.c index 333bcb2415ff..bf5ea9e9bbc1 100644 --- a/net/ipv4/tcp_scalable.c +++ b/net/ipv4/tcp_scalable.c @@ -22,7 +22,7 @@ static void tcp_scalable_cong_avoid(struct sock *sk, u32 ack, u32 acked) if (!tcp_is_cwnd_limited(sk)) return; - if (tp->snd_cwnd <= tp->snd_ssthresh) + if (tcp_in_slow_start(tp)) tcp_slow_start(tp, acked); else tcp_cong_avoid_ai(tp, min(tp->snd_cwnd, TCP_SCALABLE_AI_CNT), |