]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: rtw89: correct length for IE18/19 PHY report and IE parser
authorEric Huang <echuang@realtek.com>
Wed, 18 Jun 2025 12:46:46 +0000 (20:46 +0800)
committerPing-Ke Shih <pkshih@realtek.com>
Tue, 24 Jun 2025 06:38:27 +0000 (14:38 +0800)
Correct the length when parsing with 2nd IE header and the length
of IE18/19 PHY status report. These two IE contain PHY OFDM signal
information and can be used for debug.

Signed-off-by: Eric Huang <echuang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20250618124649.11436-4-pkshih@realtek.com
drivers/net/wireless/realtek/rtw89/core.c

index 4026cda04ef6d52cb7da792a720bbdd457449fcd..d0d2ca31b376ef713c89f9a34bd510ba5a7f84f2 100644 (file)
@@ -1723,7 +1723,7 @@ static u16 rtw89_core_get_phy_status_ie_len(struct rtw89_dev *rtwdev,
                },
                [RTW89_CHIP_BE] = {
                        32, 40, 24, 24, 8, 8, 8, 8, VAR_LEN, 8, VAR_LEN, 176, VAR_LEN,
-                       VAR_LEN, VAR_LEN, VAR_LEN, VAR_LEN, VAR_LEN, 16, 24, VAR_LEN,
+                       VAR_LEN, VAR_LEN, VAR_LEN, VAR_LEN, VAR_LEN, 88, 56, VAR_LEN,
                        VAR_LEN, VAR_LEN, 0, 24, 24, 24, 24, 32, 32, 32, 32
                },
        };
@@ -1918,6 +1918,8 @@ static int rtw89_core_rx_parse_phy_sts(struct rtw89_dev *rtwdev,
                return -EINVAL;
 
        pos = phy_ppdu->buf + PHY_STS_HDR_LEN;
+       if (phy_ppdu->hdr_2_en)
+               pos += PHY_STS_HDR_LEN;
        end = phy_ppdu->buf + phy_ppdu->len;
        while (pos < end) {
                const struct rtw89_phy_sts_iehdr *iehdr = pos;