diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-01 11:40:19 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-01 11:40:19 +0100 |
| commit | 91983dd5325297de4a2b6e1e3f22497604b6c687 (patch) | |
| tree | 82a440219533c59dde336b383f89bcfe43da3aa5 /net/ipv4/tcp_bbr.c | |
| parent | c36e3982af7020ff66886b6a7d673a8a471c4eac (diff) | |
| parent | 9c465aceb29ae6033c9021cc38a7dd219d9edb43 (diff) | |
Merge branch 'linux-linaro-lsk-v4.14' into linux-linaro-lsk-v4.14-rtlsk-v4.14-18.05-rt
Diffstat (limited to 'net/ipv4/tcp_bbr.c')
| -rw-r--r-- | net/ipv4/tcp_bbr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/tcp_bbr.c b/net/ipv4/tcp_bbr.c index 25c5a0b60cfc..9a0b952dd09b 100644 --- a/net/ipv4/tcp_bbr.c +++ b/net/ipv4/tcp_bbr.c @@ -802,7 +802,9 @@ static void bbr_update_min_rtt(struct sock *sk, const struct rate_sample *rs) } } } - bbr->idle_restart = 0; + /* Restart after idle ends only once we process a new S/ACK for data */ + if (rs->delivered > 0) + bbr->idle_restart = 0; } static void bbr_update_model(struct sock *sk, const struct rate_sample *rs) |