commit 90c4932008a969d34e3fc059512167f3d35880ad
author Chandrasekaran, Manishekar <cmshekar@qti.qualcomm.com> Tue Jun 24 13:26:14 2014 +0530
committer Kiet Lam <c_kietl@qca.qualcomm.com> Wed Jul 02 19:37:22 2014 -0700
tree 2b5bd38ac7b4e6b231eca8ea759573168959beb2
parent c14c4d8b3083e7d7f2f01245e68c2d4eaa955414

wlan: Fix to select the right country code during roaming

In the current code, with the voting logic for regulatory
in place, during roaming, instead of selecting the
country code of the AP that the STA joins, the STA is
selecting the country code that is decided by the voting
mechanism. This is fixed using this gerrit by using the
country code information from beacon and probe response
for roaming and by using the voting mechanism for other
scenarios.

CRs-Fixed: 676456
Change-Id: I512113fe7ed6b9f85af95b0800f9675add239709

CORE/SME/src/csr/csrApiRoam.c

diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 4730c64..9096116 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -3805,7 +3805,7 @@
     //Do we need to worry about sequence for OSs that are not Windows??
     if (pBssDesc)
     {
-        if (csrLearnCountryInformation(pMac, eANI_BOOLEAN_TRUE))
+        if (csrLearnCountryInformation(pMac, pBssDesc, pIes, eANI_BOOLEAN_TRUE))
         {
             //Make sure the 11d info from this BSSDesc can be applied
             pMac->scan.fAmbiguous11dInfoFound = eANI_BOOLEAN_FALSE;