From 5ac595adc1de6260bdcf85ef69269ec16b8136df Mon Sep 17 00:00:00 2001 From: Kiran Kumar Lokere Date: Wed, 26 Mar 2014 11:35:34 -0700 Subject: Fix the connection latency with hidden SSID. While checking for duplicate BSS description, if the scan reslut has been received with NULL ssid from the same BSS, then the old result of that BSS is removed and the NULL ssid result is saved and is sent to upper layers. Since there is no scan result with actual SSID, connection is delayed till the SSID is found in the result. Change-Id: I470e2f484d3c44aea302ed5ef35079188786bb1c CRs-Fixed: 634889 --- CORE/SME/src/csr/csrApiScan.c | 4 ++-- CORE/SME/src/csr/csrUtil.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c index c349028ddde2..cfccc6a3f047 100644 --- a/CORE/SME/src/csr/csrApiScan.c +++ b/CORE/SME/src/csr/csrApiScan.c @@ -4698,7 +4698,7 @@ tANI_BOOLEAN csrIsDuplicateBssDescription( tpAniSirGlobal pMac, tSirBssDescripti if(pIes1->SSID.present && pIesTemp->SSID.present) { fMatch = csrIsSsidMatch(pMac, pIes1->SSID.ssid, pIes1->SSID.num_ssid, - pIesTemp->SSID.ssid, pIesTemp->SSID.num_ssid, eANI_BOOLEAN_FALSE); + pIesTemp->SSID.ssid, pIesTemp->SSID.num_ssid, eANI_BOOLEAN_TRUE); } }while(0); @@ -4723,7 +4723,7 @@ tANI_BOOLEAN csrIsDuplicateBssDescription( tpAniSirGlobal pMac, tSirBssDescripti if(pIes1->SSID.present && pIesTemp->SSID.present) { fMatch = csrIsSsidMatch(pMac, pIes1->SSID.ssid, pIes1->SSID.num_ssid, - pIesTemp->SSID.ssid, pIesTemp->SSID.num_ssid, eANI_BOOLEAN_FALSE); + pIesTemp->SSID.ssid, pIesTemp->SSID.num_ssid, eANI_BOOLEAN_TRUE); } }while(0); } diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c index fbda5afab95a..ba8b3ab46070 100644 --- a/CORE/SME/src/csr/csrUtil.c +++ b/CORE/SME/src/csr/csrUtil.c @@ -5017,8 +5017,8 @@ tANI_BOOLEAN csrIsSsidMatch( tpAniSirGlobal pMac, tANI_U8 *ssid1, tANI_U8 ssid1L if ( eANI_BOOLEAN_FALSE == fSsidRequired ) { fMatch = TRUE; + break; } - break; } // Check for the specification of the Broadcast SSID at the beginning of the list. -- cgit v1.2.3