From 1e39fc24ee5cd7b1fea33c097fab65a18df0896c Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Fri, 18 Dec 2015 11:23:44 +0530 Subject: [PATCH] qcacld-3.0: If RSN IE is present ignore WPA IE to get cbmode qcacld-2.0 to qcacld-3.0 propagation if AP has RSN IE and supports AES, driver goes on to check WPA IE and if it contains only TKIP in unicast cipher, it sets cbmode to 0 (20Mhz). Added a check to ignore the WPA IE if RSN IE is present and take decision on cbmode with respect to RSN IE only. Change-Id: I4eaf8a2d6a9f3a43e74e606045af995fbaa800ad CRs-Fixed: 739345 --- core/sme/src/csr/csr_api_roam.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index aa08d033a091..7c58fde0ba36 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -11934,12 +11934,13 @@ static ePhyChanBondState csr_get_cb_mode_from_ies(tpAniSirGlobal pMac, if ((pIes->RSN.present && (pIes->RSN.pwise_cipher_suite_count == 1) && !memcmp(&(pIes->RSN.pwise_cipher_suites[0][0]), "\x00\x0f\xac\x02", 4)) - /* In Case WPA1 and TKIP is the only one cipher suite - * in Unicast. + /* In Case only WPA1 is supported 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))) { + || (!pIes->RSN.present && (pIes->WPA.present && + (pIes->WPA.unicast_cipher_count == 1) && + !memcmp(&(pIes->WPA.unicast_ciphers[0][0]), + "\x00\x50\xf2\x02", 4)))) { sms_log(pMac, LOGW, " No channel bonding in TKIP mode "); return PHY_SINGLE_CHANNEL_CENTERED;