From nobody Tue Apr 21 09:38:57 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 4g0HNx53P5z6bVxZ for ; Tue, 21 Apr 2026 09:38:57 +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 4g0HNx1Q7hz3LRr for ; Tue, 21 Apr 2026 09:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776764337; 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=mEzc/kOHFW2PMxju5zfs2Ma1qQltoptYc18RfxYmOCQ=; b=qsGG3uQAsBMFkVhKqqEggidBIylz2VPm5IX2/LzyXjrHs6gQCX1D50U7b3h9NAfzblunfz DJ8t5ffisQd+hF+goz/5Sz5Bb2SBtZnRJdnVoVPtmZUOlDPAEaujf4n9tNkZL2tJdIrKcH qSBPfNwczAukfeSd+Acu0BbwXaTdKCUHPsuFmUB0vI6985I23wJ19Mu3vv2/nvCnFQrW+o ecMs8MS3kQ7NBx/5aL60PU2yUDJNVFyXgex3oyrd90CiPbBfy1cTPB575rumft0DEQL77c RVaS3VBsAt5QuDI1LccGx6+J5d/uiX0gOo9N+wFEiLKiTAcLOmwqilC+O286GA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776764337; a=rsa-sha256; cv=none; b=wGZ6E3FeHrZWs0lfkjjC0HMQ+BHeISTzwJGm9FboFOXmkGY+hUvKU+mpq5JVgeQML/MZMq 7KTt9f82r9Wo6fR/WavXKCPVGPQJyJvEI6ZnZdguiYIWNlhxHtCR7sgyn5seuSnvfwfhkK /oWjkDmN4vhnzPUfFCwkVMFSJjzjxZuAm3wZwEMtiEARVJ/NY7kP92JAbbyEFZSPQev+N1 Ysfhl5CAY7POZ40tmjU65NjL3+zY08OoF20Yk6UNQes9PLnbH4vF3ThHo9DuVIXkn1EfBp jQ9StODLlxfjpVDshTYZsKyL+mUPSlwetgcqabrJUIiLhntYQ4651iq0HHyCJw== 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=1776764337; 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=mEzc/kOHFW2PMxju5zfs2Ma1qQltoptYc18RfxYmOCQ=; b=vvEP0yqUMXO6x3ksv8ArMoiUx144vl1xDzFY2gBAeaJNuYmhuzrVVO0zl5rjeNxt9Ee1NR Y2+zR8NUg/prHsvl34+S1d8OrtGtIEhYgY15WyAePJmc9CLtwU4PwjjaQacmz3M7+vbQA1 MTaH924hH307xlRe9iRYdK4GVKxdkC+LbvmYEF7VxeEnhMFHderd+BIXSL2dw6uZ9S9JVs pvrQo2oNMLmppIE/W7QhTsIYczNpuzMkRv5Zn7C354/2s/PBuTypmhge0x9K3j8smXVXAT MX7qS6f5OggtgOkj0zsmKh1wqMfB5dLezKUxxY5N+Vq6ERgs6RejpzsBXXq8Cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g0HNx0xr0zf7C for ; Tue, 21 Apr 2026 09:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36f75 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 21 Apr 2026 09:38:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: adb16cd389c3 - main - 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/main X-Git-Reftype: branch X-Git-Commit: adb16cd389c3456cbd538b658c3c0af5145dde91 Auto-Submitted: auto-generated Date: Tue, 21 Apr 2026 09:38:57 +0000 Message-Id: <69e745b1.36f75.1e2c4830@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=adb16cd389c3456cbd538b658c3c0af5145dde91 commit adb16cd389c3456cbd538b658c3c0af5145dde91 Author: Bjoern A. Zeeb AuthorDate: 2025-12-03 22:13:10 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-04-21 09:38:28 +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 MFC after: 3 days Fixes: b35044b38f74c --- 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) {