Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

wifi: mac80211: fix MPDU length parsing for EHT 5/6 GHz

The MPDU length is only configured using the EHT capabilities element on
2.4 GHz. On 5/6 GHz it is configured using the VHT or HE capabilities
respectively.

Fixes: cf0079279727 ("wifi: mac80211: parse A-MSDU len from EHT capabilities")
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
Link: https://patch.msgid.link/20250311121704.0634d31f0883.I28063e4d3ef7d296b7e8a1c303460346a30bf09c@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

authored by

Benjamin Berg and committed by
Johannes Berg
8ae227f8 72d52047

+8 -1
+8 -1
net/mac80211/eht.c
··· 2 2 /* 3 3 * EHT handling 4 4 * 5 - * Copyright(c) 2021-2024 Intel Corporation 5 + * Copyright(c) 2021-2025 Intel Corporation 6 6 */ 7 7 8 8 #include "ieee80211_i.h" ··· 75 75 76 76 link_sta->cur_max_bandwidth = ieee80211_sta_cap_rx_bw(link_sta); 77 77 link_sta->pub->bandwidth = ieee80211_sta_cur_vht_bw(link_sta); 78 + 79 + /* 80 + * The MPDU length bits are reserved on all but 2.4 GHz and get set via 81 + * VHT (5 GHz) or HE (6 GHz) capabilities. 82 + */ 83 + if (sband->band != NL80211_BAND_2GHZ) 84 + return; 78 85 79 86 switch (u8_get_bits(eht_cap->eht_cap_elem.mac_cap_info[0], 80 87 IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_MASK)) {