diff options
| author | Yuanyuan Liu <yuanliu@qca.qualcomm.com> | 2014-02-14 16:56:34 -0800 |
|---|---|---|
| committer | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-02-18 01:00:25 -0800 |
| commit | ee11c1e64c6b471b8e58a35b86f2d2a899373dca (patch) | |
| tree | 2b07c9592a4defb55d4c64a23a26da3765ce5af7 | |
| parent | e97952400ca929fc7fcaddc1849a60fbfbff39e3 (diff) | |
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
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_main.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index 9df6dfe484b2..5b31fcf92864 100644 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/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 |