commit cffc5863810c9bc10d805bcad88e61917822c2a2
author Kiet Lam <c_kietl@qca.qualcomm.com> Wed Oct 30 16:28:45 2013 +0530
committer Kiet Lam <c_kietl@qca.qualcomm.com> Wed Nov 20 14:39:54 2013 -0800
tree de75ce9bde6a35b9e618123198c01d769dccf3f5
parent c3c1e8ef43d4602497dffc959882cb8c42e3951b

wlan: handle regulatory hints from core

Ignoring regulatory hints from core can lead to
a mismatch in the channel capabilties maintained
by cfg80211 and the driver, to fix this handle
the hints from core as well.

Change-Id: Ieb70762654c419b73f3d7ede9eb9adf28662ea66
CRs-Fixed: 568857

CORE/SME/src/sme_common/sme_Api.c

diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 36e1a44..de6faba 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -4748,6 +4748,13 @@
     vos_msg_t                 msg;
     tAniGenericChangeCountryCodeReq *pMsg;
 
+    if (NULL == pMac)
+    {
+        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,
+            "%s: pMac is null", __func__);
+        return status;
+    }
+
     status = sme_AcquireGlobalLock( &pMac->sme );
     if ( HAL_STATUS_SUCCESS( status ) )
     {
@@ -7059,7 +7066,7 @@
 
 /* ---------------------------------------------------------------------------
 
-    \fn sme_HandleChangeCountryCodeByDriver
+    \fn sme_HandleChangeCountryCodeByCore
 
     \brief Update Country code in the driver if set by kernel as world
 
@@ -7073,8 +7080,10 @@
     \return eHalStatus
 
   -------------------------------------------------------------------------------*/
-eHalStatus sme_HandleChangeCountryCodeByDriver(tpAniSirGlobal pMac, tAniGenericChangeCountryCodeReq *pMsg)
+eHalStatus sme_HandleChangeCountryCodeByCore(tpAniSirGlobal pMac, tAniGenericChangeCountryCodeReq *pMsg)
 {
+    eHalStatus  status;
+
     smsLog(pMac, LOG1, FL(" called"));
 
     //this is to make sure kernel & driver are in sync in case of CC found in
@@ -7085,6 +7094,26 @@
         palCopyMemory(pMac->hHdd, pMac->scan.countryCode11d, pMsg->countryCode,
                       WNI_CFG_COUNTRY_CODE_LEN);
     }
+
+    status = WDA_SetRegDomain(pMac, REGDOMAIN_WORLD);
+
+    if ( status != eHAL_STATUS_SUCCESS )
+    {
+        smsLog( pMac, LOGE, FL("  fail to set regId") );
+        return status;
+    }
+    else
+    {
+        status = csrInitGetChannels(pMac);
+        if ( status != eHAL_STATUS_SUCCESS )
+        {
+            smsLog( pMac, LOGE, FL("  fail to get Channels "));
+        }
+        else
+        {
+            csrInitChannelList(pMac);
+        }
+    }
     smsLog(pMac, LOG1, FL(" returned"));
     return eHAL_STATUS_SUCCESS;
 }
@@ -7117,7 +7146,7 @@
 
     if (REGDOMAIN_COUNT == reg_domain_id)
     {
-        sme_HandleChangeCountryCodeByDriver(pMac, pMsg);
+        sme_HandleChangeCountryCodeByCore(pMac, pMsg);
     }
     else
     {
@@ -9608,8 +9637,8 @@
 
     if (NULL == pMac)
     {
-        VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
-                       "smeGetCommandQStatus: pMac is NULL");
+        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,
+            "%s: pMac is null", __func__);
         return;
     }