commit 0e5922d998987deb79bc2cbe43bba20bda2c428c
author Madan Mohan Koyyalamudi <mkoyyala@qca.qualcomm.com> Tue Sep 10 15:45:24 2013 +0530
committer Madan Mohan Koyyalamudi <mkoyya@codeaurora.org> Mon Sep 16 16:19:26 2013 -0700
tree 51b814c83091a94c7d24176867071e198802cab9
parent 99ba358711e85840d68ce1d0a70ac9ced1a3f3ed

wlan: Passing correct list to cfg before changing country code.

Channel list should be passed properly before changing country
code.

CRs-Fixed: 537315
Change-Id: I461bc6ed622f21b5a863176fa3e7bb990c0394a0

CORE/SME/src/csr/csrApiScan.c

diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 6735e44..53aaa71 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -3887,6 +3887,11 @@
         if ( domainId != pMac->scan.domainIdCurrent )
         {
             tSirMacChanInfo* pMacChnSet = (tSirMacChanInfo *)(&pIesLocal->Country.triplets[0]);
+            palCopyMemory( pMac->hHdd, pMac->scan.countryCode11d, pIesLocal->Country.country,
+                                        sizeof( pMac->scan.countryCode11d ) );
+            csrSetCfgCountryCode(pMac, pIesLocal->Country.country);
+            WDA_SetRegDomain(pMac, domainId);
+            pMac->scan.domainIdCurrent = domainId;
             // Check whether AP provided the 2.4GHZ list or 5GHZ list
             if(CSR_IS_CHANNEL_24GHZ(pMacChnSet[0].firstChanNum))
             {
@@ -3898,9 +3903,6 @@
                 // AP Provided the 5G Channels, Update the 2.4GHZ channel list from nv.bin
                 csrGet24GChannels(pMac );
             }
-            csrSetCfgCountryCode(pMac, pIesLocal->Country.country);
-            WDA_SetRegDomain(pMac, domainId);
-            pMac->scan.domainIdCurrent = domainId;
         }
         // Populate both band channel lists based on what we found in the country information...
         csrSetOppositeBandChannelInfo( pMac );