Commit 9bdfb3b7 authored Feb 21, 2016 by Konstantin Khlebnikov Committed by David S. Miller Feb 23, 2016

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: 740b0f18 ("tcp: switch rtt estimations to usec resolution")
Signed-off-by: David S. Miller <davem@davemloft.net>

parent fb5eb24c

net/ipv4/tcp_metrics.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -550,7 +550,7 @@ void tcp_init_metrics(struct sock *sk)
		*/
		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