From 2d693b9ddab360d5a9a9945a1f701fb1af22d6ea Mon Sep 17 00:00:00 2001 From: Tushnim Bhattacharyya Date: Wed, 19 Sep 2018 13:19:24 -0700 Subject: [PATCH] qcacld-3.0: Honor the vht capability from vandor IE in SAP mode While sending the peer assoc to FW, fill up the vht information from vandor IE, if it is carrying the VHT capability information. Change-Id: Ifcb299a5b16a14a1b20ae39ffcf3126e8bc20f9b CRs-Fixed: 2318709 --- core/mac/src/pe/lim/lim_assoc_utils.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index 86e074c3f824..8d764e53674d 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -2139,6 +2139,7 @@ lim_add_sta(tpAniSirGlobal mac_ctx, uint8_t i, nw_type_11b = 0; tLimIbssPeerNode *peer_node; /* for IBSS mode */ const uint8_t *p2p_ie = NULL; + tDot11fIEVHTCaps vht_caps; sir_copy_mac_addr(sta_mac, session_entry->selfMacAddr); @@ -2384,9 +2385,14 @@ lim_add_sta(tpAniSirGlobal mac_ctx, sizeof(add_sta_params->ht_caps)); } - if (assoc_req && add_sta_params->vhtCapable) + if (assoc_req && add_sta_params->vhtCapable) { + if (assoc_req->vendor_vht_ie.VHTCaps.present) + vht_caps = assoc_req->vendor_vht_ie.VHTCaps; + else + vht_caps = assoc_req->VHTCaps; add_sta_params->vht_caps = - lim_populate_vht_caps(assoc_req->VHTCaps); + lim_populate_vht_caps(vht_caps); + } lim_add_he_cap(add_sta_params, assoc_req);