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_cong.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_cong.c')
| -rw-r--r-- | net/ipv4/tcp_cong.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c index 84be008c945c..a2ed23c595cf 100644 --- a/net/ipv4/tcp_cong.c +++ b/net/ipv4/tcp_cong.c @@ -365,10 +365,8 @@ int tcp_set_congestion_control(struct sock *sk, const char *name) */ u32 tcp_slow_start(struct tcp_sock *tp, u32 acked) { - u32 cwnd = tp->snd_cwnd + acked; + u32 cwnd = min(tp->snd_cwnd + acked, tp->snd_ssthresh); - if (cwnd > tp->snd_ssthresh) - cwnd = tp->snd_ssthresh + 1; acked -= cwnd - tp->snd_cwnd; tp->snd_cwnd = min(cwnd, tp->snd_cwnd_clamp); @@ -413,7 +411,7 @@ void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 acked) return; /* In "safe" area, increase. */ - if (tp->snd_cwnd <= tp->snd_ssthresh) { + if (tcp_in_slow_start(tp)) { acked = tcp_slow_start(tp, acked); if (!acked) return; |