diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-30 18:11:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-30 18:11:18 +0100 |
| commit | f004eaf4d17d205842424a7e95dcff9a46fe3c5f (patch) | |
| tree | fbf213d7b933b4f58b031269a2a31b275c95be6c /net/ipv4/tcp_metrics.c | |
| parent | abf92a3d2e868fef808d4a205371b7e5417dd0f7 (diff) | |
| parent | 937433c2502f663e5a0e8804462bc38c41b9021f (diff) | |
Merge remote-tracking branch 'regulator/topic/da9210' into regulator-devm
Diffstat (limited to 'net/ipv4/tcp_metrics.c')
| -rw-r--r-- | net/ipv4/tcp_metrics.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c index 4a22f3e715df..52f3c6b971d2 100644 --- a/net/ipv4/tcp_metrics.c +++ b/net/ipv4/tcp_metrics.c @@ -502,7 +502,9 @@ reset: * ACKs, wait for troubles. */ if (crtt > tp->srtt) { - inet_csk(sk)->icsk_rto = crtt + max(crtt >> 2, tcp_rto_min(sk)); + /* Set RTO like tcp_rtt_estimator(), but from cached RTT. */ + crtt >>= 3; + inet_csk(sk)->icsk_rto = crtt + max(2 * crtt, tcp_rto_min(sk)); } else if (tp->srtt == 0) { /* RFC6298: 5.7 We've failed to get a valid RTT sample from * 3WHS. This is most likely due to retransmission, |