commit 6c5833355adbf2b4a92dc26410a289361e0ad983
author Kiet Lam <c_kietl@qca.qualcomm.com> Mon Oct 14 05:37:09 2013 +0530
committer Kiet Lam <c_kietl@qca.qualcomm.com> Sat Nov 16 16:51:22 2013 -0800
tree 5056592f6b863f52d924caf9279488a2ca9ddc91
parent 826d94196d9b4c9eec96f1149aebeb2d5f24836e

wlan: use correct regulatory APIs

use regulatory_hint_user() API when
the hint comes from the country IE or
userspace

CRs-Fixed: 564372
Change-Id: I4dd7f77ca572e4ce66377ca9c0b038328a419289

CORE/SME/src/csr/csrApiRoam.c

diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 55bc85e..6bb82fc 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -337,7 +337,17 @@
             //status = eHAL_STATUS_SUCCESS;
         }
         smsLog( pMac, LOG1, FL(" country Code from nvRam %.2s"), pMac->scan.countryCodeDefault );
-        csrGetRegulatoryDomainForCountry(pMac, pMac->scan.countryCodeDefault, &regId);
+
+        if (!('0' == pMac->scan.countryCodeDefault[0] &&
+            '0' == pMac->scan.countryCodeDefault[1]))
+        {
+            csrGetRegulatoryDomainForCountry(pMac, pMac->scan.countryCodeDefault,
+                                             &regId, COUNTRY_NV);
+        }
+        else
+        {
+            regId = REGDOMAIN_WORLD;
+        }
         WDA_SetRegDomain(pMac, regId);
         pMac->scan.domainIdDefault = regId;
         pMac->scan.domainIdCurrent = pMac->scan.domainIdDefault;
@@ -374,7 +384,8 @@
        return eHAL_STATUS_FAILURE;
     }
 */
-    status = csrGetRegulatoryDomainForCountry(pMac, apCntryCode, &regId);
+    status = csrGetRegulatoryDomainForCountry(pMac, apCntryCode, &regId,
+                                              COUNTRY_USER);
     if (status != eHAL_STATUS_SUCCESS)
     {
         smsLog( pMac, LOGE, FL("  fail to get regId for country Code %.2s"), apCntryCode );