diff options
| author | Kiran Kumar Lokere <klokere@qca.qualcomm.com> | 2014-11-04 11:42:34 -0800 |
|---|---|---|
| committer | AnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com> | 2014-11-06 17:25:13 +0530 |
| commit | 3fcaffc32e5927e84987f3f8cd8d0cc1aca04600 (patch) | |
| tree | b996ee0ef5cc3ebaab559109b2b910b00929993f | |
| parent | 7185397498793f0022e79ce80e35252d45850208 (diff) | |
qcacld: Fix the channel bonding issue with TKIP
Disable the channel bonding only if the pairwise cipher suite has
only TKIP in the beacon frame.
Change-Id: I273da804bf317bc0081f994ee405b38af9f52f21
CRs-Fixed: 750676
| -rw-r--r-- | CORE/SME/src/csr/csrApiRoam.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c index 4a402ad9ba83..69af7f63c2cd 100644 --- a/CORE/SME/src/csr/csrApiRoam.c +++ b/CORE/SME/src/csr/csrApiRoam.c @@ -11688,10 +11688,12 @@ tANI_BOOLEAN csrRoamIsValid40MhzChannel(tpAniSirGlobal pMac, tANI_U8 channel) //Figure what the other side's CB mode if(WNI_CFG_CHANNEL_BONDING_MODE_DISABLE != ChannelBondingMode) { - if(pIes->HTCaps.present && (eHT_CHANNEL_WIDTH_40MHZ == pIes->HTCaps.supportedChannelWidthSet)) + 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]) && + if (((NULL != &(pIes->RSN.pwise_cipher_suites[0][0]) && + (pIes->RSN.pwise_cipher_suite_count == 1)) && !memcmp( &(pIes->RSN.pwise_cipher_suites[0][0]), "\x00\x0f\xac\x02" ,4)) || (((NULL != &(pIes->WPA)) && |