git: 8696cc8d0bbf - stable/15 - rtw89: fix mismerge
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 22 Apr 2026 21:09:23 UTC
The branch stable/15 has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=8696cc8d0bbf4a87bc7c87186b0c5d35253b91ca
commit 8696cc8d0bbf4a87bc7c87186b0c5d35253b91ca
Author: Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2025-12-03 22:13:10 +0000
Commit: Bjoern A. Zeeb <bz@FreeBSD.org>
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) {