diff options
| author | Abhishek Singh <absingh@qti.qualcomm.com> | 2015-06-25 19:25:22 +0530 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2015-06-26 18:28:18 +0530 |
| commit | 88fca9023e803dd75e9c2f9b102aaaed99da9341 (patch) | |
| tree | bc14202170a1bfcf2047d5e670f1c8b6dd5c07ef | |
| parent | e71bffa07a6d9200a279dc70d4bcc2826f904764 (diff) | |
qcacld-2.0: STA is disconnected with specific AP IPTIME N904NS-second
prima to qcacld-2.0 propagation
STA gets disconnected with AP IPTIME N904NS when AP is configured
for WPA1 + TKIP on CH 161.
Return value of memcmp function must be checked with NOT operation.
Change-Id: Ic866a70917c1e713855c28a8f156ffe7c381fa07
CRs-Fixed: 642070
| -rw-r--r-- | CORE/SME/src/csr/csrApiRoam.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c index c7a072bcfcf7..a0c09620d9b4 100644 --- a/CORE/SME/src/csr/csrApiRoam.c +++ b/CORE/SME/src/csr/csrApiRoam.c @@ -11844,16 +11844,17 @@ tANI_BOOLEAN csrRoamIsValid40MhzChannel(tpAniSirGlobal pMac, tANI_U8 channel) if(pIes->HTCaps.present && (eHT_CHANNEL_WIDTH_40MHZ == pIes->HTCaps.supportedChannelWidthSet)) { - // Check set as TKIP or not. - if (((NULL != &(pIes->RSN.pwise_cipher_suites[0][0]) && - (pIes->RSN.pwise_cipher_suite_count == 1)) && - !memcmp( &(pIes->RSN.pwise_cipher_suites[0][0]), + /* In Case WPA2 and TKIP is the only one cipher suite in Pairwise */ + if ((pIes->RSN.present && + (pIes->RSN.pwise_cipher_suite_count == 1) && + !memcmp(&(pIes->RSN.pwise_cipher_suites[0][0]), "\x00\x0f\xac\x02" ,4)) - || (((NULL != &(pIes->WPA)) && - (pIes->WPA.unicast_cipher_count == 1)) - && ((NULL != &(pIes->WPA.unicast_ciphers[0])) - && !memcmp(&(pIes->WPA.unicast_ciphers[0]), - "\x00\x50\xf2\x02", 4)))) { + /* In Case WPA1 and TKIP is the + * only one cipher suite in Unicast. + */ + || (pIes->WPA.present && (pIes->WPA.unicast_cipher_count == 1) + && !memcmp(&(pIes->WPA.unicast_ciphers[0][0]), + "\x00\x50\xf2\x02", 4))) { smsLog(pMac, LOGW, " No channel bonding in TKIP mode "); eRet = PHY_SINGLE_CHANNEL_CENTERED; } |