From nobody Wed Apr 22 21:09:23 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 4g1Bg81JWYz6bLNs for ; Wed, 22 Apr 2026 21:09:24 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g1Bg74GCzz3mPr for ; Wed, 22 Apr 2026 21:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776892163; 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=Y5DQ8PGMQnzbiaK+juGX8muq3IweM6rtzCj30FP0Ibw=; b=p4KpyQRY2eZW5hBmQ8gqNgSv5hQYq1vZuYeItL7LA7hVt+6tAMI/P7plj4rLoRjqGQY3fZ uUD8OsjrgPegfcLub2h8sup2T2HPb6vkw0LUa81zdx/O7g8IX1oH0ERURqmsOZhEuMRMw8 hgEjys7FTl219WT5hqiZQsz74/5eJLVAjUKozjKIEquTnI3UMQbfZ5Kpfj1acPdSFKTfmb gumzOxhGBBx9qxruK3TjBfEXmTgg44RYwL/IumTZgaYz/CLo/ldZvHBw95L/1R1Lbaj0is 8daAUg3YBRNaZJtlPE78aOsTm1izl9OXrYvFlutiLUmge4xVIW5Rp5Jrsn4DSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776892163; a=rsa-sha256; cv=none; b=J3Xgc/5+3GzCpls245HsBKYdZJmuYh+RID5AlR54KlmHDaXpxLvhsITAnUz5JMbxo4KS4q J6fTIUSHaGbpyrG3uzyyRpYSkHd/KR0DDhV4nUnUVgsuBDkfpjtCaT/DnbC69EYGsEWE6j /7On6M4Ij5IqYH65t1xNwoUBSCr8D1ASbtISbro3m9WtYVjYCBLwvO4tKduv2WMQF8oAon etpLB00554bKHAFmgsPorruNrZC/STMip7HYUNepYkVzltCVsvLsvjO9TqpYrnzpbbzgIq KcHPUlGClv2ZZ83A8Y7l28aWKt3SO2NzXyg6ZNaaH4p8QLtad9POv8JTl1ddZQ== 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=1776892163; 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=Y5DQ8PGMQnzbiaK+juGX8muq3IweM6rtzCj30FP0Ibw=; b=ylACCP3ZMl//6b9BC+v83qFZq299Zl7HZuuZtZj6qghbjtnPX5LWQH/ccvaLSokSElHAtm 4x95oppGff2nrwtpT61/2T+xq7oEGlyy1FUkuT+zk0Sqa38JbAzdZiXVpyPmQD7Ufsmg+/ BDmHSvCXVxHfi0cXZb1QSY7V62r7CMOk0TlAKTWxXBOOp7el7bITxu1pQo2y7na3DT8Ajh Q74Lew4CBB1w2/kl3w+zw0zPKQZMu5xUvsHz8z97mMLtJeL+U+OHLyoRSmMy7stMaLGeud Kof5sftWGEyx3ojZBU4aMt0Ra7SHFEouV8CPebXUMhGPjrxoczjBKs0oXh1DVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1Bg73qyvznb7 for ; Wed, 22 Apr 2026 21:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26abf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 21:09:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 8696cc8d0bbf - stable/15 - rtw89: fix mismerge 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8696cc8d0bbf4a87bc7c87186b0c5d35253b91ca Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 21:09:23 +0000 Message-Id: <69e93903.26abf.36311834@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8696cc8d0bbf4a87bc7c87186b0c5d35253b91ca commit 8696cc8d0bbf4a87bc7c87186b0c5d35253b91ca Author: Bjoern A. Zeeb AuthorDate: 2025-12-03 22:13:10 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-04-22 20:57:17 +0000 rtw89: fix mismerge Due to FreeBSD-specific code it seems a code update was not applied to the FreeBSD part during the v6.17 driver update. Add the missing lines. Sponsored by: The FreeBSD Foundation Fixes: b35044b38f74c (cherry picked from commit adb16cd389c3456cbd538b658c3c0af5145dde91) --- sys/contrib/dev/rtw89/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/contrib/dev/rtw89/core.c b/sys/contrib/dev/rtw89/core.c index c834649014b4..7fea67b63624 100644 --- a/sys/contrib/dev/rtw89/core.c +++ b/sys/contrib/dev/rtw89/core.c @@ -2278,6 +2278,8 @@ static int rtw89_core_rx_parse_phy_sts(struct rtw89_dev *rtwdev, end = phy_ppdu->buf + phy_ppdu->len; #elif defined(__FreeBSD__) pos = (u8 *)phy_ppdu->buf + PHY_STS_HDR_LEN; + if (phy_ppdu->hdr_2_en) + pos += PHY_STS_HDR_LEN; end = (u8 *)phy_ppdu->buf + phy_ppdu->len; #endif while (pos < end) {