From nobody Fri Sep 5 07:06:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cJ6p65vJdz67Cn6; Fri, 05 Sep 2025 07:06:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJ6p64ylrz40XW; Fri, 05 Sep 2025 07:06:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757055982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=flkHhCVgPgKNflWfIgUt1ZMarJodeB55+WAvY4UXRHo=; b=dTw0wkn8eT18ecBpq66Lgmoh3JsR5GR9DB7DnrxDA75GFBkoWjAjJ1a3ur8RDsgAwTbquG 58ICT3le8l8bldgxqd6M/JGu4ce9I/vjTbnkFiIeyO5qxeoVBi26P0mb5+dtIjW6se1rHq cNkRwOuyl+SKfkCruTGRbEoH8fgDi8Ch//6HtdsWZZE/haWhQfi2o+mtyIf/646V8Fk6gJ qhsE3TH4ODEYTMgNXtOGGMzN9HNThjQN3NbsYJIXZMgOOuJM+vnoRjY4XmvfpOIMlz+qco ZqrPx3hDeL1YCPeZR7pXHb+LqFMeg9x17L+Cvs+Vt6Vslps9bUu9cakAdipELQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757055982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=flkHhCVgPgKNflWfIgUt1ZMarJodeB55+WAvY4UXRHo=; b=oHZjhyTXKCS8erMJMz08K/aHWLc8+lEQ/cEDEEnBWzEKy/SY8lwMGXj1SqRwJmRIaptczA dN+fjmzvZ2QZnfe8vVz39qc5vZVZPP9dnY6zC0yt9kWTuKohtGLKgGYq1ucwyLOT25tvSO 7h5+ydWLXb8yymavFApHeTiHIBARTz978hq8FqUzy9U3PMQqxPntx94RhTBAebigt0poFj syH7G4ZTNJz482gBotQENanxfUD11F1d5Qd+sOulb7cDI/6XxPIqFxbeAu7FwMkKI2O/pz ILeedazppELRyIPvkWDGX6eO5GZ6/En8XnhoS+BlvoufgdCKLqs05p+il6G6rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757055982; a=rsa-sha256; cv=none; b=SOe0z7Zg8Jwek1CaqDJiwKo1/NHXVL82K4OgoO2RupfFqNn8e96EW1CnPKAG4tujmBcBQn a7nJc+zDUcY//3RTuTwEFO6luZnjCwhPlpfvDlRtT5bEYtBSGIMiUbcoRqa8Uk82bwnDr+ qMoadUqepPktv9zob0H6IHVikxiyFuNGm4KX6uHC5lCMJL6y8cibuVSTIOmwaNpSWoWXVb toyX16kILX4GtKDDL6qsXBIvUwye3/KUUt+pVfqUg3F+3pRAg6qyZv/ngoWiQydz9VQyXT xVzgnAmKPSXbjSMBC57MAUiNGgzJRaxmKNpggGfUjK3nDLwzFJK0YOfG8Zc8ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cJ6p64Drdzdgp; Fri, 05 Sep 2025 07:06:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58576MK8083917; Fri, 5 Sep 2025 07:06:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58576McG083912; Fri, 5 Sep 2025 07:06:22 GMT (envelope-from git) Date: Fri, 5 Sep 2025 07:06:22 GMT Message-Id: <202509050706.58576McG083912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: f33397e3092b - stable/14 - tcp hpts: use consistently inline instead of __inline List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f33397e3092bb8dd36ba0458bff8e7f861345a91 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f33397e3092bb8dd36ba0458bff8e7f861345a91 commit f33397e3092bb8dd36ba0458bff8e7f861345a91 Author: Nick Banks AuthorDate: 2025-07-20 12:33:31 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 07:05:18 +0000 tcp hpts: use consistently inline instead of __inline Reviewed by: tuexen Sponsored by: Netflix, Inc. (cherry picked from commit 22bebbb211e304f09a29764f24ad9cfb82cee7f0) --- sys/netinet/tcp_hpts.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/netinet/tcp_hpts.h b/sys/netinet/tcp_hpts.h index b097a2b98db9..a623d959db9a 100644 --- a/sys/netinet/tcp_hpts.h +++ b/sys/netinet/tcp_hpts.h @@ -165,25 +165,25 @@ extern int32_t tcp_min_hptsi_time; * The following functions should also be available * to userspace as well. */ -static __inline uint32_t +static inline uint32_t tcp_tv_to_hptstick(const struct timeval *sv) { return ((sv->tv_sec * 100000) + (sv->tv_usec / HPTS_TICKS_PER_SLOT)); } -static __inline uint32_t +static inline uint32_t tcp_tv_to_usectick(const struct timeval *sv) { return ((uint32_t) ((sv->tv_sec * HPTS_USEC_IN_SEC) + sv->tv_usec)); } -static __inline uint32_t +static inline uint32_t tcp_tv_to_mssectick(const struct timeval *sv) { return ((uint32_t) ((sv->tv_sec * HPTS_MSEC_IN_SEC) + (sv->tv_usec/HPTS_USEC_IN_MSEC))); } -static __inline uint64_t +static inline uint64_t tcp_tv_to_lusectick(const struct timeval *sv) { return ((uint64_t)((sv->tv_sec * HPTS_USEC_IN_SEC) + sv->tv_usec)); @@ -199,7 +199,7 @@ get_hpts_min_sleep_time(void) return (tcp_min_hptsi_time + HPTS_TICKS_PER_SLOT); } -static __inline uint32_t +static inline uint32_t tcp_gethptstick(struct timeval *sv) { struct timeval tv; @@ -210,7 +210,7 @@ tcp_gethptstick(struct timeval *sv) return (tcp_tv_to_hptstick(sv)); } -static __inline uint64_t +static inline uint64_t tcp_get_u64_usecs(struct timeval *tv) { struct timeval tvd; @@ -221,7 +221,7 @@ tcp_get_u64_usecs(struct timeval *tv) return (tcp_tv_to_lusectick(tv)); } -static __inline uint32_t +static inline uint32_t tcp_get_usecs(struct timeval *tv) { struct timeval tvd;