mt76_skb_get_hdr() skips only the HE radiotap fields, so for a frame with EHT radiotap TLVs in front of the 802.11 header it returns the first TLV. mt76_check_ccmp_pn() then checks QoS Data of EHT PPDUs against the counter of robust Management frames, and mt76_rx_aggr_check_ctl() does not see a BlockAckReq. Return the mac header for a frame with RX_FLAG_RADIOTAP_TLV_AT_END, which mac80211 requires to point to the 802.11 header. Fixes: 97d7ab9f51ec ("wifi: mt76: mt7925: add EHT radiotap support in monitor mode") Fixes: e016239fcb98 ("wifi: mt76: mt7996: Add eht radiotap tlv") Signed-off-by: Felix Fietkau --- drivers/net/wireless/mediatek/mt76/mt76.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h index da135e76aabb..8f8388d44aa9 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76.h +++ b/drivers/net/wireless/mediatek/mt76/mt76.h @@ -1485,6 +1485,9 @@ static inline void *mt76_skb_get_hdr(struct sk_buff *skb) mstat = *((struct mt76_rx_status *)skb->cb); + if (mstat.flag & RX_FLAG_RADIOTAP_TLV_AT_END) + return skb_mac_header(skb); + if (mstat.flag & RX_FLAG_RADIOTAP_HE) data += sizeof(struct ieee80211_radiotap_he); if (mstat.flag & RX_FLAG_RADIOTAP_HE_MU) -- 2.47.3