From e32e52a575b540a531e0d4a3a2101d5f4b41c8f3 Mon Sep 17 00:00:00 2001 From: hqu Date: Thu, 9 Jan 2020 20:02:53 +0800 Subject: [PATCH] qcacld-3.0: Intersect he_capable from SAP and ref STA When SAP doesn't support 11ax phymode, ref STA which support 11ax phymode connect to SAP, this will result in firmware crash due to WMI_PEER_ASSOC_CMDID set peer_flags with WMI_PEER_HE and peer_phymode set with SAP session phymode which doesn't support HE capability. Fix is to intersect he_capable from SAP and ref STA. Change-Id: I9f63f5474db03e96a404ac86ff7929e8ebabc9f3 CRs-Fixed: 2599957 --- core/mac/src/pe/lim/lim_utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index a03c8df59c189..b4abe282a1413 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -7160,7 +7160,8 @@ void lim_update_sta_he_capable(struct mac_context *mac, struct pe_session *session_entry) { if (LIM_IS_AP_ROLE(session_entry) || LIM_IS_IBSS_ROLE(session_entry)) - add_sta_params->he_capable = sta_ds->mlmStaContext.he_capable; + add_sta_params->he_capable = sta_ds->mlmStaContext.he_capable && + session_entry->he_capable; #ifdef FEATURE_WLAN_TDLS else if (STA_ENTRY_TDLS_PEER == sta_ds->staType) add_sta_params->he_capable = sta_ds->mlmStaContext.he_capable;