From cd451c20c6b31630131a93189aef26a4f6b720ed Mon Sep 17 00:00:00 2001 From: Deeksha Gupta Date: Mon, 1 Aug 2022 18:39:13 +0530 Subject: [PATCH] qcacld-3.0: Fix pack and unpack EHT-MCS map (BW = 160 MHz) issue As a part of eht cap pack and unpack, EHT MCS map (BW = 160 MHz) is present only if B2 of the Supported Channel Width Set field in the HE PHY capabilities information field is 1. Change-Id: I24519b27e67219a9d4611636e2c02af4b82b17ec CRs-Fixed: 3258157 --- core/mac/src/sys/legacy/src/utils/src/parser_api.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index 75173ec590..a5cdf0a615 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -8279,10 +8279,7 @@ QDF_STATUS lim_ieee80211_unpack_ehtcap(const uint8_t *eht_cap_ie, idx++; } - if ((dot11f_he_cap.chan_width_6 | dot11f_he_cap.chan_width_5 | - dot11f_he_cap.chan_width_4 | dot11f_he_cap.chan_width_3 | - dot11f_he_cap.chan_width_2 | dot11f_he_cap.chan_width_1 | - dot11f_he_cap.chan_width_0) == 1) { + if (dot11f_he_cap.chan_width_2 == 1) { dot11f_eht_cap->bw_160_rx_max_nss_for_mcs_0_to_9 = ehtcap_ie_get(ehtcap->mcs_nss_map_bytes[idx], EHTCAP_RX_MCS_NSS_MAP_IDX, @@ -8697,10 +8694,7 @@ void lim_ieee80211_pack_ehtcap(uint8_t *ie, tDot11fIEeht_cap dot11f_eht_cap, idx++; } - if ((dot11f_he_cap.chan_width_6 | dot11f_he_cap.chan_width_5 | - dot11f_he_cap.chan_width_4 | dot11f_he_cap.chan_width_3 | - dot11f_he_cap.chan_width_2 | dot11f_he_cap.chan_width_1 | - dot11f_he_cap.chan_width_0) == 1) { + if (dot11f_he_cap.chan_width_2 == 1) { val = dot11f_eht_cap.bw_160_rx_max_nss_for_mcs_0_to_9; ehtcap_ie_set(&ehtcap->mcs_nss_map_bytes[idx], EHTCAP_RX_MCS_NSS_MAP_IDX,