qcacld: Update mac address using /persist/wlan_mac.bin

We give user defined file /persist/wlan_mac.bin the highest
priority of updating mac address. If this file exist, we overwrite
current mac address with the value provided by wlan_mac.bin.

Change-Id: Ibfc397dbb137ddcf9840a00077625e6a31c6a692
CRs-Fixed: 616540

CORE/HDD/src/wlan_hdd_main.c

@@ -9122,13 +9122,6 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc)
       goto err_config;
    }
 
-   if ( VOS_STATUS_SUCCESS != hdd_update_mac_config( pHddCtx ) )
-   {
-      hddLog(VOS_TRACE_LEVEL_WARN,
-             "%s: can't update mac config, using MAC from ini file",
-             __func__);
-   }
-
    pHddCtx->current_intf_count=0;
    pHddCtx->max_intf_count = WLAN_MAX_INTERFACES;
 
@@ -9406,6 +9399,14 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc)
       }
 #endif //WLAN_AUTOGEN_MACADDR_FEATURE && QCA_WIFI_ISOC
    }
+
+   if ( VOS_STATUS_SUCCESS != hdd_update_mac_config( pHddCtx ) )
+   {
+      hddLog(VOS_TRACE_LEVEL_WARN,
+             "%s: can't update mac config, using MAC from ini file",
+             __func__);
+   }
+
    {
       eHalStatus halStatus;
       // Set the MAC Address