Skip to content

Commit 7d2e941

Browse files
committed
wifi: mac80211: fix MPDU length parsing for EHT 5/6 GHz
JIRA: https://issues.redhat.com/browse/RHEL-79791 commit 8ae227f Author: Benjamin Berg <[email protected]> Date: Tue Mar 11 12:17:04 2025 +0100 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: cf00792 ("wifi: mac80211: parse A-MSDU len from EHT capabilities") Reviewed-by: Miriam Rachel Korenblit <[email protected]> Signed-off-by: Benjamin Berg <[email protected]> Link: https://patch.msgid.link/20250311121704.0634d31f0883.I28063e4d3ef7d296b7e8a1c303460346a30bf09c@changeid Signed-off-by: Johannes Berg <[email protected]> Signed-off-by: Jose Ignacio Tornos Martinez <[email protected]>
1 parent e5a70cb commit 7d2e941

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

net/mac80211/eht.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*
33
* EHT handling
44
*
5-
* Copyright(c) 2021-2024 Intel Corporation
5+
* Copyright(c) 2021-2025 Intel Corporation
66
*/
77

88
#include "ieee80211_i.h"
@@ -76,6 +76,13 @@ ieee80211_eht_cap_ie_to_sta_eht_cap(struct ieee80211_sub_if_data *sdata,
7676
link_sta->cur_max_bandwidth = ieee80211_sta_cap_rx_bw(link_sta);
7777
link_sta->pub->bandwidth = ieee80211_sta_cur_vht_bw(link_sta);
7878

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;
85+
7986
switch (u8_get_bits(eht_cap->eht_cap_elem.mac_cap_info[0],
8087
IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_MASK)) {
8188
case IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_11454:

0 commit comments

Comments
 (0)