git: 1bb521ab7de7 - stable/13 - tcp: Fix 32 bit platform breakage

Michael Tuexen tuexen at FreeBSD.org
Tue Jul 13 20:39:56 UTC 2021


The branch stable/13 has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=1bb521ab7de7923c001bdbab30269dd3f336b371

commit 1bb521ab7de7923c001bdbab30269dd3f336b371
Author:     Randall Stewart <rrs at FreeBSD.org>
AuthorDate: 2021-07-08 11:06:58 +0000
Commit:     Michael Tuexen <tuexen at FreeBSD.org>
CommitDate: 2021-07-13 19:59:50 +0000

    tcp: Fix 32 bit platform breakage
    
    This fixes the incorrect use of a sysctl add to u64. It
    was for a useconds time, but on 32 bit platforms its
    not a u64. Instead use the long directive.
    
    Reviewed by:            tuexen
    Sponsored by:           Netflix Inc.
    Differential Revision:  https://reviews.freebsd.org/D31107
    
    (cherry picked from commit 7312e4e5cfc8e48597acf17f4faa8159f0b5fa06)
---
 sys/netinet/tcp_hpts.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c
index 9a390e3a85c8..9ec092f703ec 100644
--- a/sys/netinet/tcp_hpts.c
+++ b/sys/netinet/tcp_hpts.c
@@ -2208,10 +2208,10 @@ tcp_init_hptsi(void *st)
 		    OID_AUTO, "lastran", CTLFLAG_RD,
 		    &cts_last_ran[i], 0,
 		    "The last usec tick that this hpts ran");
-		SYSCTL_ADD_U64(&hpts->hpts_ctx,
+		SYSCTL_ADD_LONG(&hpts->hpts_ctx,
 		    SYSCTL_CHILDREN(hpts->hpts_root),
 		    OID_AUTO, "cur_min_sleep", CTLFLAG_RD,
-		    &hpts->p_mysleep.tv_usec, 0,
+		    &hpts->p_mysleep.tv_usec,
 		    "What the running pacers is using for p_mysleep.tv_usec");
 		SYSCTL_ADD_U64(&hpts->hpts_ctx,
 		    SYSCTL_CHILDREN(hpts->hpts_root),


More information about the dev-commits-src-branches mailing list