RE: [PATCH v2] wifi: rtw89: read the beacon header from the skb data
From: Ping-Ke Shih
Date: Thu Nov 19 2026 - 00:40:58 EST
Shirong Zhao <shxzhaosr@xxxxxxx> wrote:
> (v2: reworded subject and commit message, added the two
> Fixes: tags and Ping-Ke's Tested-by/Acked-by)
This should be put after your s-o-b with --- delimiter.
I forgot to say that I will rephrase the commit message when committing.
>
> 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.
No need too much description which obscures the focus.
>
> 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.
Yes. But "fortunately" it is zero for this case.
>
> 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.
This is not standard tag. Should not here.
> Tested-by: Ping-Ke Shih <pkshih@xxxxxxxxxxx>
> Signed-off-by: Shirong Zhao <shxzhaosr@xxxxxxx>
> Acked-by: Ping-Ke Shih <pkshih@xxxxxxxxxxx>
Anyway, I'll take v1 and modify commit message while committing.