From nobody Mon Aug 3 11:28:34 2026 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 4hDDvX1HLlz6nB7d for ; Mon, 03 Aug 2026 11:28:40 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hDDvW5W8Vz3NrF for ; Mon, 03 Aug 2026 11:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785756519; 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=hQO+uqBYALzp3/Wg/cmK18nN1L1Bh7e/qGr8P+KhYQk=; b=bHV7JCKaFXYXKauN/J9qmdsVNDKG/vj24EwdZ5c3BCtvKjwj3C8nnKJlVSVwzlxwyXJ7xd L7QrHCK8b2TLMqnWUJFU2k/5KUmZygtxcZPKVfHYZ8W+e4wNPzAL7Xy6SlVRZWNiNLCTAT EpCpGYr6z131EICymjlUVbpbpK+Bb2qyodzdzh8sufbNPq20hHqity0yE+zza3ymNHWt/m /qiijILprN5rQLquFJPTO4KSXUV8Af3irX3OJkz0W+Gb5fwqTjBtGjSd5kGmeRqrGjsVET boE7EKJpYxEX2G2z6tWdQieWBzhvCcuvIfRCwy1OCMUamoGVCovn3vHMuWDYsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785756519; a=rsa-sha256; cv=none; b=nSTGQ/ICdINaPQ+y58CHiujef0BRLzM1L1qYt9J6Q3yXKwTp7BAeIpBByrxydjnR4dFyk5 PDKwKiFIi5mtjhDtci3todNnonzGzApuzhwSj6SnyXN4h5/R575kcmqIR8G/TFElwetYNy /YNdCc8jsKelWgzQ+JMbOARqCycJ1o/+QaPUiIruV8z1vpFXrNvG5pfVEdFKx1B8a8CgrA Cq1BJtZG+659JnP+VVwJ4WcKYQXeab4NbZ/5DMac21uWpP39P69aT6sLmfldbu5PGmMdNh GGwh5ADvsxzMpNdNZSBxGVV4IrbWvkKzG0QxgiLbKRwTZEndOzUikp9zBfwv7A== 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=1785756519; 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=hQO+uqBYALzp3/Wg/cmK18nN1L1Bh7e/qGr8P+KhYQk=; b=jrIpUQ9GICldDt17puLIMhic5RU1/+v8VhlBH3aw2J7snMYQ5+H3aPTERZhXZ43qOERzb+ g1RINN4sraGGEVU3E7PgjP4steaErRS+KmxO4qURhuNu6YFboS8SXzAeFB7lcAF99hnHE1 35hK9ArqrY8opoIovUDcaOIQ2oqZ717i/BZda5dLVq4UTbXODVP9RyC6+vUDHf0x6hqlip t48O5BReZ7EdN6KJ0ndN9DIW8J6aDbVwtDoletJZPbtFMiGItdm1kOGNGAPYnsLUOGC6xE 4MdyzAUj5dqMWQuyO66MNobEfAhNhD8E/FiIa8PhfQdaTf7ewbk9C8ddY1YL0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDDvW4ZTPzygm for ; Mon, 03 Aug 2026 11:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 186ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 03 Aug 2026 11:28:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bruce M Simpson Subject: git: 4a59a0cf99bb - main - netinet6: Add a definition of struct ip6_hdr_pseudo{} for OCF compatibility. 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bms X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a59a0cf99bb9a48ccea62e9499186e892cf51bc Auto-Submitted: auto-generated Date: Mon, 03 Aug 2026 11:28:34 +0000 Message-Id: <6a707b62.186ca.7f9db7bb@gitrepo.freebsd.org> The branch main has been updated by bms: URL: https://cgit.FreeBSD.org/src/commit/?id=4a59a0cf99bb9a48ccea62e9499186e892cf51bc commit 4a59a0cf99bb9a48ccea62e9499186e892cf51bc Author: Bruce M Simpson AuthorDate: 2026-07-30 15:53:11 +0000 Commit: Bruce M Simpson CommitDate: 2026-08-03 11:27:44 +0000 netinet6: Add a definition of struct ip6_hdr_pseudo{} for OCF compatibility. This change is intended to address @glebius comments from the original D55663. ip6_hdr_pseudo{} is referenced by certain OpenBSD OCF related components. I am using __aligned(4) and not __packed as urged by the late Hans-Petter Selasky. Use C99 types and style. We must eat the churn now cross-BSD compatibility is "Fade to Black". Put _Static_assert under #ifdef INVARIANTS to not disrupt regular compilation, as this resides in a commonly included header file. --- sys/netinet6/ip6_var.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index 9a861ab20647..769a254cdf52 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -66,6 +66,24 @@ #include #ifdef _KERNEL +/* + * For IPv6 pseudo header checksum; to be used by TCP-MD5, + * and for OCF source level compatibility with OpenBSD. + */ +struct ip6_hdr_pseudo { + struct in6_addr ip6ph_src; + struct in6_addr ip6ph_dst; + uint32_t ip6ph_len; + uint8_t ip6ph_zero[3]; + uint8_t ip6ph_nxt; +} __aligned(4); + +#ifdef INVARIANTS +/* Aligned size of pseudo-header must equal size of IPv6 header. */ +_Static_assert(sizeof(struct ip6_hdr_pseudo) == 40, + "IPv6 pseudo-header alignment failure"); +#endif + struct ip6asfrag; /* frag6.c */ TAILQ_HEAD(ip6fraghead, ip6asfrag);