commit 0a402239f937ffbc8cb896235d91fee86dafa9ce
author Amar Singhal <asinghal@qca.qualcomm.com> Fri Oct 11 20:57:16 2013 -0700
committer Kiet Lam <c_kietl@qca.qualcomm.com> Tue Nov 12 16:33:29 2013 -0800
tree 112bfc60a30c0c9158151e5ec6c72817e775caeb
parent c7608aeb533131ccfd4a352be49a5b92bd38a603

wlan: set wiphy flag conditionally

In case CONFIG_ENABLE_LINUX_REG is defined, lookup NV.bin table to see
if the device is world roaming. If that is the case, set the wiphy custom
regulatory flag. Custom regulatory flag ensures the base for the channel
information set by the kernel remains as world roaming.

Change-Id: I4bdadea9b0a35e22f1057321403552210ca7fdac
CRs-Fixed: 538940

CORE/HDD/src/wlan_hdd_main.c

diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 2cb0fcc..640ffbe 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -207,6 +207,7 @@
 int isWDresetInProgress(void);
 
 extern int hdd_setBand_helper(struct net_device *dev, tANI_U8* ptr);
+
 #if  defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
 void hdd_getBand_helper(hdd_context_t *pHddCtx, int *pBand);
 static VOS_STATUS hdd_parse_channellist(tANI_U8 *pValue, tANI_U8 *pChannelList, tANI_U8 *pNumChannels);
@@ -7452,11 +7453,34 @@
    }
 
 #ifdef CONFIG_ENABLE_LINUX_REG
+   /* initialize the NV module. This is required so that
+      we can initialize the channel information in wiphy
+      from the NV.bin data. The channel information in
+      wiphy needs to be initialized before wiphy registration */
+
+   status = vos_nv_open();
+   if (!VOS_IS_STATUS_SUCCESS(status))
+   {
+       /* NV module cannot be initialized */
+       hddLog( VOS_TRACE_LEVEL_FATAL,
+                "%s: vos_nv_open failed", __func__);
+       goto err_clkvote;
+   }
+
+   status = vos_init_wiphy_from_nv_bin();
+   if (!VOS_IS_STATUS_SUCCESS(status))
+   {
+       /* NV module cannot be initialized */
+       hddLog( VOS_TRACE_LEVEL_FATAL,
+               "%s: vos_init_wiphy failed", __func__);
+       goto err_vos_nv_close;
+   }
+
    /* registration of wiphy dev with cfg80211 */
    if (0 > wlan_hdd_cfg80211_register(wiphy))
    {
        hddLog(VOS_TRACE_LEVEL_ERROR,"%s: wiphy register failed", __func__);
-       goto err_clkvote;
+       goto err_vos_nv_close;
    }
 #endif
 
@@ -7886,6 +7910,10 @@
 #ifdef CONFIG_ENABLE_LINUX_REG
    wiphy_unregister(wiphy);
 
+err_vos_nv_close:
+
+   vos_nv_close();
+
 err_clkvote:
 #endif