From 2eb4c8309fc605490eea700944f9d8c2378bb33d Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Thu, 15 Feb 2018 10:47:38 -0800 Subject: [PATCH] qcacld-3.0: Fix suBFormee/suBFormer in handling assoc request In handling assoc request make sure to use VHT IE or vendor VHT IE appropriately for suBFormee/suBFormer calculation. Change-Id: I3934a0c7229a8a400d1aa54fe3bf0bc3513d4d70 CRs-Fixed: 2159206 --- .../src/pe/lim/lim_process_assoc_req_frame.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c index 79765aef4652..ecd3f4d6413d 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c @@ -1471,17 +1471,28 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, sta_ds->mlmStaContext.htCapability = 0; sta_ds->mlmStaContext.vhtCapability = 0; } - if (sta_ds->mlmStaContext.vhtCapability) { + + if (sta_ds->mlmStaContext.vhtCapability && vht_caps) { if (session->vht_config.su_beam_formee && - assoc_req->VHTCaps.suBeamFormerCap) + vht_caps->suBeamFormerCap) sta_ds->vhtBeamFormerCapable = 1; else sta_ds->vhtBeamFormerCapable = 0; if (session->vht_config.su_beam_former && - assoc_req->VHTCaps.suBeamformeeCap) + vht_caps->suBeamformeeCap) sta_ds->vht_su_bfee_capable = 1; else sta_ds->vht_su_bfee_capable = 0; + + pe_debug("peer_caps: suBformer: %d, suBformee: %d", + vht_caps->suBeamFormerCap, + vht_caps->suBeamformeeCap); + pe_debug("self_cap: suBformer: %d, suBformee: %d", + session->vht_config.su_beam_former, + session->vht_config.su_beam_formee); + pe_debug("connection's final cap: suBformer: %d, suBformee: %d", + sta_ds->vhtBeamFormerCapable, + sta_ds->vht_su_bfee_capable); } lim_intersect_sta_he_caps(assoc_req, session, sta_ds);