Home Verkennen Help
Inloggen
GfA
/
linux_kernel
5
0
Vork 0
Bestanden Issues 0 Pull-aanvragen 0 Wiki
Bladeren bron

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>
Konstantin Khlebnikov 9 jaren geleden
bovenliggende
fb5eb24cdd
commit
9bdfb3b79e
1 gewijzigde bestanden met toevoegingen van 1 en 1 verwijderingen
Gecombineerde weergave Toon Diff Stats
  1. 1 1
      net/ipv4/tcp_metrics.c

+ 1 - 1
net/ipv4/tcp_metrics.c
Bestand weergeven 

@@ -550,7 +550,7 @@ reset:
 
 	 */
 
 	 */
 
 	if (crtt > tp->srtt_us) {
 
 	if (crtt > tp->srtt_us) {
 
 		/* Set RTO like tcp_rtt_estimator(), but from cached RTT. */
 
 		/* 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));
 
 		inet_csk(sk)->icsk_rto = crtt + max(2 * crtt, tcp_rto_min(sk));
 
 	} else if (tp->srtt_us == 0) {
 
 	} else if (tp->srtt_us == 0) {
 
 		/* RFC6298: 5.7 We've failed to get a valid RTT sample from
 
 		/* RFC6298: 5.7 We've failed to get a valid RTT sample from