From nobody Sat Dec 30 14:44:37 2023 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 4T2Q4j39Thz55M8K; Sat, 30 Dec 2023 14:44:37 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T2Q4j2S94z3VqJ; Sat, 30 Dec 2023 14:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703947477; 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=Wtmqfr53sk0D0oK6TL7UJya8J43iry0Rnjlmoaghn/Q=; b=vWy/KphbINAABssWB49m5D2rTT23MxtMo4XQp87UOV7B29ih41ACMw6ZhWCiJEsgO/8FGe KL/NCyYzidhhYvd3P2xGr/7liOPaqgonHHFWnauoypHI5Na+24kqjXQR34oqBxDFKfctcn BzJyBl4IEk4JMyXlLuC/M83Cjb5zRxTOj+yPTtXAZoKLry258WA7t2/il6hDjfLpDK8kmo xkgd/WA9BEyz1nAnrxyxj5h02nQDmhBKgAqJ+92OX0p7jF7F9QTHrVHMCpyFpGRo46jlGd RJhJsoh3HHgG0aYf5UungAAqXkCv3muyDq3NOFp9ga0maWOy86Cda+bQM4Um5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703947477; a=rsa-sha256; cv=none; b=U2Ti3lQrtFtNbHuiSqCbX19W4JqZvFc69NEy00p/aHk8osih5oUOAr+bFg1Mc4qypPYblo TyVDGaYBKop3alqaJU1b2l9Vqkpq5a7SB1oDqUfVxppK6QhJz2HQ//8zxjFcUtWBdZI7uX Gz20dVAGUOax7meIwfD95jjWPoacsO/ZB2ejiFcx09YScK9vRXFnhrh50U/z6bqVe63VuF Ho5mBxWQYuq5Zj8ljo3aG1F/VutOpmiR+bQgH5Xd/aOENjG+Fis/qV7rH/tyPk9YGosr8R aUP+UoBXdJrGnWiILTgo/Recg+UXId2N8omI76zHElmVWxDAAEFkr/mnPv15ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703947477; 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=Wtmqfr53sk0D0oK6TL7UJya8J43iry0Rnjlmoaghn/Q=; b=URzl8Y6LsMrDRRtgI5fTSqe9ginLqnXoJ+StzWbgcJjnTHPbuuT7U+9O/C5Vvc6s9PTwrt /5ulTCGm8K7f0/tfhtkBzI27O9CW4D3TcJ7Z30KlsytKFp2AeSq3siTHXL/TsyYlgmV0bc DNkhuVVbukexmjLh/lEjL0KcKt2QqSms9oqtuUqlaDBYV6vwG6IatjHktWOKLKHrWofx+8 C32/rYeBdMDFFo3nV4NeR7xCViv+OMk/5Y26SoXct4jXIXAn5i3joyFYSH4Gv8YYKuEgpd 1Dhm7r3eFGQywGYL7Qvm3qMkOPth2eRwlDIKzrHGgLq3R80KSkyKJFNP1jD9kg== 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 4T2Q4j1MvczvDq; Sat, 30 Dec 2023 14:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BUEibqJ051711; Sat, 30 Dec 2023 14:44:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BUEibUT051709; Sat, 30 Dec 2023 14:44:37 GMT (envelope-from git) Date: Sat, 30 Dec 2023 14:44:37 GMT Message-Id: <202312301444.3BUEibUT051709@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 642ac6015b56 - main - tcp: fix ports 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 642ac6015b56ab7c1bcb34f0558567c7f9f9743a Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=642ac6015b56ab7c1bcb34f0558567c7f9f9743a commit 642ac6015b56ab7c1bcb34f0558567c7f9f9743a Author: Michael Tuexen AuthorDate: 2023-12-30 02:28:13 +0000 Commit: Michael Tuexen CommitDate: 2023-12-30 02:28:13 +0000 tcp: fix ports inline is only support in C99 and newer. To support also C89, use __inline instead as suggested by dim. Reported by: eduardo Reviewed by: rscheff, markj, dim, imp Tested by: eduardo Fixes: a8b70cf26030 ("netpfil: Use accessor functions and named constants for all tcphdr flags") Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D43231 --- sys/netinet/tcp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index 209b89c9a427..64286ede9575 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -79,13 +79,13 @@ struct tcphdr { u_short th_urp; /* urgent pointer */ }; -static inline uint16_t +static __inline uint16_t tcp_get_flags(const struct tcphdr *th) { return (((uint16_t)th->th_x2 << 8) | th->th_flags); } -static inline void +static __inline void tcp_set_flags(struct tcphdr *th, uint16_t flags) { th->th_x2 = (flags >> 8) & 0x0f;