The branch main has been updated by tuexen:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=22bebbb211e304f09a29764f24ad9cfb82cee7f0

commit 22bebbb211e304f09a29764f24ad9cfb82cee7f0
Author:     Nick Banks <nickba...@netflix.com>
AuthorDate: 2025-07-20 12:33:31 +0000
Commit:     Michael Tuexen <tue...@freebsd.org>
CommitDate: 2025-07-20 12:33:31 +0000

    tcp hpts: use consistently inline instead of __inline
    
    Reviewed by:    tuexen
    MFC after:      1 week
    Sponsored by:   Netflix, Inc.
---
 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;

Reply via email to