From nobody Mon Oct 20 18:10:28 2025 X-Original-To: dev-commits-src-main@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 4cr3Pf2g3Wz6CsbF; Mon, 20 Oct 2025 18:10:30 +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 4cr3Pd1xmDz40pK; Mon, 20 Oct 2025 18:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760983830; 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=eS9DISTkW2WW7tTvMSncZugxhO7JZjgHbiXROUP4k6I=; b=xfOI97gKI7zXMdUUMiL3Vjmpb94hnlcgWJtrtVh80iav4klmvCeVHBlPRCd9/qWyCv1uxH EEQPSO+c2aMZ1yKJxfUFL5EzXMxg4NsVh+qiPSuO12qLXG6mAOzZOkcF5b2PLYOZflSwuy GwILUN9+772Sginh+kO35onSHMjJAMC23SLvkCeoTDyBDPnZ6MHKKyEI9ww6HaUEEhnikp DjbJ0hC21NBSwrwh8imTA+GreXKewIuTKn23w7ea3iYBeDjQPWysl3IvNi5isjpyr0yHow g+La50vCtRdBat/8eNUktIwWRjLvCTZ6XdedUL3mX/Uuov9kelTj0kOKMkaeow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760983829; 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=eS9DISTkW2WW7tTvMSncZugxhO7JZjgHbiXROUP4k6I=; b=A7N9wcbpFeMRGFNlx+Nfbshqzz9FaRbZb8S+t39Kz1/zXAvosWD+2Sqw54BWlXYYGJiwTV vIaYriy105Bxse1SteMWW1u4t4VXjs+VKxHuI6lA7R9AvvRvRkuxDIiZLdh3Zo6LqybjVR +oPDzxYHzvH1LwRMcm9C8/nWhjlrnDeX7RtI/Tod4mznxhbA8zoF7koGFooAlvuf1Hv1TN qU5uxpy37jzyW1tVuLmJMJgz/LWPE8X+PV7Hfr560VleutQEHfcox/rDpuTqsTBiwne6Kk AQt83EmwgzyveSlwX75yTCKmss5wTKwpMe8BieRUX0qEa/PxbQrHzZZa3n1yqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760983829; a=rsa-sha256; cv=none; b=hypkw274IjpLBsOvKjmqZVUmzv+tNQQubMlQL4ikgNRPFOU2InI1qCBpDx0H08Kvr2vpp/ wnEN+riQGO7SKYAllFpxpGzQde+ZCf6niMfXpeATJycujTVaZD0awDZB8fl6c/uDr69OTf OTxOY3KGndIkAQ4V/eMpfjr5n7kgwP5mJmp4VyqzNZJyvLBXd8QY24S1qHh6Bp3tJOmpT9 VSE1e/KfRfVGnoZwAEOilbGRWBLaIJoEufNymLXLbzcOA4PP2y4pZ9ROgn/vgQsur4R2GP byXzFZ81jziIHHL4eKFa7ITwsGliPKWl0zLQplpCIOuLtiM34BXd/ynJR+aK+w== 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 4cr3Pd1Gjlz85F; Mon, 20 Oct 2025 18:10:29 +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 59KIASSX061145; Mon, 20 Oct 2025 18:10:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KIASGL061142; Mon, 20 Oct 2025 18:10:28 GMT (envelope-from git) Date: Mon, 20 Oct 2025 18:10:28 GMT Message-Id: <202510201810.59KIASGL061142@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: a8e4399fc6a2 - main - Move bbr and rack to use inline per C99 (TCP Sub-system) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8e4399fc6a27b4f8ab828231ede75743ba28a58 Auto-Submitted: auto-generated The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=a8e4399fc6a27b4f8ab828231ede75743ba28a58 commit a8e4399fc6a27b4f8ab828231ede75743ba28a58 Author: Randall Stewart AuthorDate: 2025-10-20 18:09:11 +0000 Commit: Randall Stewart CommitDate: 2025-10-20 18:09:11 +0000 Move bbr and rack to use inline per C99 (TCP Sub-system) This is a small change as suggested by Gleb to move all __inline -> inline aka C99 style. This covers both BBR and Rack and makes no real changes to the code functionality Reviewed by: tuexen Differential Revision: --- sys/netinet/tcp_stacks/bbr.c | 8 ++++---- sys/netinet/tcp_stacks/rack.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 66983edcdd73..10383bc0801e 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -477,7 +477,7 @@ bbr_log_rtt_shrinks(struct tcp_bbr *bbr, uint32_t cts, uint32_t applied, uint16_t set); static struct bbr_sendmap * bbr_find_lowest_rsm(struct tcp_bbr *bbr); -static __inline uint32_t +static inline uint32_t bbr_get_rtt(struct tcp_bbr *bbr, int32_t rtt_type); static void bbr_log_to_start(struct tcp_bbr *bbr, uint32_t cts, uint32_t to, int32_t pacing_delay, @@ -1841,7 +1841,7 @@ bbr_counter_destroy(void) } -static __inline void +static inline void bbr_fill_in_logging_data(struct tcp_bbr *bbr, struct tcp_log_bbr *l, uint32_t cts) { memset(l, 0, sizeof(union tcp_log_stackspecific)); @@ -4206,7 +4206,7 @@ bbr_calc_thresh_tlp(struct tcpcb *tp, struct tcp_bbr *bbr, /* * Return one of three RTTs to use (in microseconds). */ -static __inline uint32_t +static inline uint32_t bbr_get_rtt(struct tcp_bbr *bbr, int32_t rtt_type) { uint32_t f_rtt; @@ -4370,7 +4370,7 @@ bbr_timeout_rack(struct tcpcb *tp, struct tcp_bbr *bbr, uint32_t cts) return (0); } -static __inline void +static inline void bbr_clone_rsm(struct tcp_bbr *bbr, struct bbr_sendmap *nrsm, struct bbr_sendmap *rsm, uint32_t start) { int idx; diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 0320479e882e..50077abdfd86 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -4730,7 +4730,7 @@ rack_make_timely_judgement(struct tcp_rack *rack, uint32_t rtt, int32_t rtt_diff return (timely_says); } -static __inline int +static inline int rack_in_gp_window(struct tcpcb *tp, struct rack_sendmap *rsm) { if (SEQ_GEQ(rsm->r_start, tp->gput_seq) && @@ -4767,7 +4767,7 @@ rack_in_gp_window(struct tcpcb *tp, struct rack_sendmap *rsm) return (0); } -static __inline void +static inline void rack_mark_in_gp_win(struct tcpcb *tp, struct rack_sendmap *rsm) { @@ -4784,7 +4784,7 @@ rack_mark_in_gp_win(struct tcpcb *tp, struct rack_sendmap *rsm) rsm->r_flags &= ~RACK_IN_GP_WIN; } -static __inline void +static inline void rack_clear_gp_marks(struct tcpcb *tp, struct tcp_rack *rack) { /* A GP measurement is ending, clear all marks on the send map*/ @@ -4802,7 +4802,7 @@ rack_clear_gp_marks(struct tcpcb *tp, struct tcp_rack *rack) } -static __inline void +static inline void rack_tend_gp_marks(struct tcpcb *tp, struct tcp_rack *rack) { struct rack_sendmap *rsm = NULL; @@ -7017,7 +7017,7 @@ rack_setup_offset_for_rsm(struct tcp_rack *rack, struct rack_sendmap *src_rsm, s rsm->orig_t_space = M_TRAILINGROOM(rsm->m); } -static __inline void +static inline void rack_clone_rsm(struct tcp_rack *rack, struct rack_sendmap *nrsm, struct rack_sendmap *rsm, uint32_t start) {