diff options
author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2016-02-21 10:12:39 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-02-23 18:28:46 -0500 |
commit | 9bdfb3b79e61c60e1a3e2dc05ad164528afa6b8a (patch) | |
tree | 84cfe9e9a212f8ecfca93453561800acf3b8a9ac /net/ipv4/tcp_metrics.c | |
parent | fb5eb24cdd5cdb83be77d3e4b2f16e92e06bd9e9 (diff) | |
download | linux-stable-9bdfb3b79e61c60e1a3e2dc05ad164528afa6b8a.tar.gz linux-stable-9bdfb3b79e61c60e1a3e2dc05ad164528afa6b8a.tar.bz2 linux-stable-9bdfb3b79e61c60e1a3e2dc05ad164528afa6b8a.zip |
tcp: convert cached rtt from usec to jiffies when feeding initial rto
Currently it's converted into msecs, thus HZ=1000 intact.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Fixes: 740b0f1841f6 ("tcp: switch rtt estimations to usec resolution")
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_metrics.c')
-rw-r--r-- | net/ipv4/tcp_metrics.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c index c8cbc2b4b792..a726d7853ce5 100644 --- a/net/ipv4/tcp_metrics.c +++ b/net/ipv4/tcp_metrics.c @@ -550,7 +550,7 @@ reset: */ if (crtt > tp->srtt_us) { /* Set RTO like tcp_rtt_estimator(), but from cached RTT. */ - crtt /= 8 * USEC_PER_MSEC; + crtt /= 8 * USEC_PER_SEC / HZ; inet_csk(sk)->icsk_rto = crtt + max(2 * crtt, tcp_rto_min(sk)); } else if (tp->srtt_us == 0) { /* RFC6298: 5.7 We've failed to get a valid RTT sample from |