wlan: Set phymode in SME considering HT and VHT capability.
qcacld 2.0 to prima propagation
Set phymode to 11ac only when HT Caps and VHT Caps are present.
Earlier we were setting phymode in SME based on HT/VHT capability
independently. If a rogue AP sends only VHT Capability but not HT
capability, our phymode computation was incorrect.
Change-Id: Id3db66798a1a1e3ebc42da59a66cea04093e78aa
CRs-Fixed: 879830
diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index 9da468c..a17bfdd 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -2340,19 +2340,18 @@
{
phyMode = eCSR_DOT11_MODE_TAURUS;
}
- }
- }
+ }
+ }
if(pIes->HTCaps.present && (eCSR_DOT11_MODE_TAURUS != phyMode))
{
phyMode = eCSR_DOT11_MODE_11n;
- }
-
#ifdef WLAN_FEATURE_11AC
- if ( pIes->VHTCaps.present && (eCSR_DOT11_MODE_TAURUS != phyMode))
- {
- phyMode = eCSR_DOT11_MODE_11ac;
- }
+ if ( pIes->VHTCaps.present)
+ {
+ phyMode = eCSR_DOT11_MODE_11ac;
+ }
#endif
+ }
*pPhyMode = phyMode;
}