Module Name: src
Committed By: mlelstv
Date: Sat Oct 17 08:50:38 UTC 2020
Modified Files:
src/sys/netinet: tcp_usrreq.c
Log Message:
Fix RTT values reported by TCP_INFO.
To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/sys/netinet/tcp_usrreq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.226 src/sys/netinet/tcp_usrreq.c:1.227
--- src/sys/netinet/tcp_usrreq.c:1.226 Mon Apr 13 15:54:45 2020
+++ src/sys/netinet/tcp_usrreq.c Sat Oct 17 08:50:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.226 2020/04/13 15:54:45 maxv Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.227 2020/10/17 08:50:38 mlelstv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.226 2020/04/13 15:54:45 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.227 2020/10/17 08:50:38 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -258,8 +258,10 @@ tcp_fill_info(struct tcpcb *tp, struct t
ti->tcpi_rto = tp->t_rxtcur * tick;
ti->tcpi_last_data_recv = (long)(getticks() -
(int)tp->t_rcvtime) * tick;
- ti->tcpi_rtt = ((u_int64_t)tp->t_srtt * tick) >> TCP_RTT_SHIFT;
- ti->tcpi_rttvar = ((u_int64_t)tp->t_rttvar * tick) >> TCP_RTTVAR_SHIFT;
+ ti->tcpi_rtt = ((u_int64_t)tp->t_srtt * tick / PR_SLOWHZ)
+ >> (TCP_RTT_SHIFT + 2);
+ ti->tcpi_rttvar = ((u_int64_t)tp->t_rttvar * tick / PR_SLOWHZ)
+ >> (TCP_RTTVAR_SHIFT + 2);
ti->tcpi_snd_ssthresh = tp->snd_ssthresh;
/* Linux API wants these in # of segments, apparently */
