[PATCH v2] wifi: rtw89: read the beacon header from the skb data

From: Shirong Zhao

Date: Thu Nov 19 2026 - 00:25:36 EST


(v2: reworded subject and commit message, added the two
Fixes: tags and Ping-Ke's Tested-by/Acked-by)

Point hdr at skb_beacon->data instead of the sk_buff pointer itself,
to get the correct header length for the TIM offset passed to firmware.

rtw89_fw_h2c_update_beacon() and rtw89_fw_h2c_update_beacon_be() cast
the sk_buff itself to struct ieee80211_hdr:

hdr = (struct ieee80211_hdr *)skb_beacon;

The 802.11 header lives in the frame data returned by
ieee80211_beacon_get_tim(), not at the start of struct sk_buff, so that
cast reads sk_buff metadata instead of frame_control.

Fortunately the original (wrong) header fc is 0x0000, so the header
length is recognized as 24 bytes, which is almost the same as the AP
mode application. The value is still wrong in principle and would
break as soon as the sk_buff layout supplies a non-zero value there.

Fixes: 69466b979a72 ("wifi: rtw89: use struct to fill H2C command to download beacon frame")
Fixes: a880b9283009 ("wifi: rtw89: add H2C command to download beacon frame for WiFi 7 chips")
Found by code inspection; not observed at runtime.
Tested-by: Ping-Ke Shih <pkshih@xxxxxxxxxxx>
Signed-off-by: Shirong Zhao <shxzhaosr@xxxxxxx>
Acked-by: Ping-Ke Shih <pkshih@xxxxxxxxxxx>
---
drivers/net/wireless/realtek/rtw89/fw.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index 21b548c..0eab77f 100644
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -5130,7 +5130,7 @@ int rtw89_fw_h2c_update_beacon(struct rtw89_dev *rtwdev,
skb_put_data(skb_beacon, noa_data, noa_len);
}

- hdr = (struct ieee80211_hdr *)skb_beacon;
+ hdr = (struct ieee80211_hdr *)skb_beacon->data;
tim_offset -= ieee80211_hdrlen(hdr->frame_control);

bcn_total_len = len + skb_beacon->len;
@@ -5209,7 +5209,7 @@ int rtw89_fw_h2c_update_beacon_be(struct rtw89_dev *rtwdev,
skb_put_data(skb_beacon, noa_data, noa_len);
}

- hdr = (struct ieee80211_hdr *)skb_beacon;
+ hdr = (struct ieee80211_hdr *)skb_beacon->data;
tim_offset -= ieee80211_hdrlen(hdr->frame_control);

bcn_total_len = len + skb_beacon->len;