From 229646adce3344698ba23399d4dcfff27f0ca458 Mon Sep 17 00:00:00 2001 From: Archana Ramachandran Date: Wed, 16 Mar 2016 13:53:41 -0700 Subject: cld-2.0: Fix STA including incorrect SMPS value in the HT caps of the reassoc req When creating the reassoc session, HT SMPS value should be copied from existing session to the reassoc session but the session supported NSS should be set to default value of true and not copied from exisiting session. Session supported NSS should be the intersection of NSS supported by STA and AP that STA will reassoc to. CRs-Fixed: 991042 Change-Id: Ic1577882aaa9c1923ba1dac2126e0cf11e542e36 --- CORE/MAC/src/pe/lim/limFT.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/CORE/MAC/src/pe/lim/limFT.c b/CORE/MAC/src/pe/lim/limFT.c index 259646029c09..24677b3a0763 100644 --- a/CORE/MAC/src/pe/lim/limFT.c +++ b/CORE/MAC/src/pe/lim/limFT.c @@ -1006,7 +1006,7 @@ void limFillFTSession(tpAniSirGlobal pMac, pftSessionEntry->htSupportedChannelWidthSet; pftSessionEntry->enableHtSmps = psessionEntry->enableHtSmps; - pftSessionEntry->smpsMode = psessionEntry->smpsMode; + pftSessionEntry->htSmpsvalue = psessionEntry->htSmpsvalue; /* * By default supported NSS 1x1 is set to true * and later on updated while determining session @@ -1017,7 +1017,7 @@ void limFillFTSession(tpAniSirGlobal pMac, limLog(pMac, LOG1, FL("FT enable smps: %d mode: %d supported nss 1x1: %d"), pftSessionEntry->enableHtSmps, - pftSessionEntry->smpsMode, + pftSessionEntry->htSmpsvalue, pftSessionEntry->supported_nss_1x1); vos_mem_free(pBeaconStruct); @@ -1275,10 +1275,7 @@ void limHandleFTPreAuthRsp(tpAniSirGlobal pMac, tSirRetStatus status, vos_mem_copy(&(pftSessionEntry->htConfig), &(psessionEntry->htConfig), sizeof(psessionEntry->htConfig)); pftSessionEntry->limSmeState = eLIM_SME_WT_REASSOC_STATE; - pftSessionEntry->enableHtSmps = psessionEntry->enableHtSmps; pftSessionEntry->smpsMode = psessionEntry->smpsMode; - pftSessionEntry->supported_nss_1x1 = psessionEntry->supported_nss_1x1; - pftSessionEntry->htSmpsvalue = psessionEntry->htSmpsvalue; PELOGE(limLog(pMac, LOG1, "%s:created session (%p) with id = %d", __func__, pftSessionEntry, pftSessionEntry->peSessionId);) -- cgit v1.2.3