summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCNSS_WLAN Service <cnssbldsw@qualcomm.com>2018-03-07 14:14:50 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-03-07 14:14:50 -0800
commit6d53fe4cd0cd6a9aa2d78ad78df4cb99f6888801 (patch)
treeaa38b7aa332329d31debce9d157ff397d677d966
parentffc95f495a1ef070548a3456f60729b288ca3131 (diff)
parent3ca8c2bbac0834d0ad1bc05dab0b48ef95fd0018 (diff)
Merge "qcacld-2.0: Update ini mac address only if firmware doesn't provides" into wlan-cld2.driver.lnx.1.0
-rw-r--r--CORE/HDD/src/wlan_hdd_main.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index fcabd53751d6..db4273170397 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -16230,13 +16230,11 @@ static int hdd_initialize_mac_address(hdd_context_t *hdd_ctx)
if (!hdd_ctx->cfg_ini->skip_mac_config) {
status = hdd_update_mac_config(hdd_ctx);
- if (status != VOS_STATUS_SUCCESS) {
- hddLog(LOGW,
- FL("Failed to update MAC from %s status: %d"),
- WLAN_MAC_FILE, status);
- return -EIO;
- }
- return 0;
+ if (status == VOS_STATUS_SUCCESS)
+ return 0;
+
+ hddLog(LOGW, FL("Can't update MAC from %s status: %d"),
+ WLAN_MAC_FILE, status);
}
if (!vos_is_macaddr_zero(&hdd_ctx->hw_macaddr)) {