summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshish Kumar Dhanotiya <adhanoti@codeaurora.org>2018-02-23 21:19:01 +0530
committerAshish Kumar Dhanotiya <adhanoti@codeaurora.org>2018-02-23 21:24:36 +0530
commit360f55c4bef2d55e719bf7c8d55709030077509f (patch)
tree926d7c7d09a6429710e552ec3a386458eea90a1f
parentbc7e9383947675ea7321b37be8892337b586c73e (diff)
qcacld-3.0: Enable MAC provisioning for one platform MAC address
Currently if MAC provisioning is enabled, driver requires minimum 2 MAC addresses from platform driver to load. Enable driver loading if platform driver provides minimum one MAC address. Change-Id: I09ff9868eb4a941e8c77cfee0714e74f025a27e9 CRs-Fixed: 2194004
-rw-r--r--core/hdd/src/wlan_hdd_main.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index cce83aeeb240..fc1b9177cb02 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -9409,8 +9409,7 @@ static int hdd_platform_wlan_mac(hdd_context_t *hdd_ctx)
addr = hdd_get_platform_wlan_mac_buff(dev, &no_of_mac_addr);
- if (no_of_mac_addr == 0 || !addr ||
- (hdd_ctx->config->mac_provision && (no_of_mac_addr < 2))) {
+ if (no_of_mac_addr == 0 || !addr) {
hdd_err("Platform Driver doesn't have provisioned mac addr");
return -EINVAL;
}
@@ -9512,10 +9511,7 @@ static int hdd_initialize_mac_address(hdd_context_t *hdd_ctx)
bool update_mac_addr_to_fw = true;
ret = hdd_platform_wlan_mac(hdd_ctx);
- if (hdd_ctx->config->mac_provision)
- return ret;
-
- if (ret == 0)
+ if (hdd_ctx->config->mac_provision || !ret)
return ret;
hdd_info("MAC is not programmed in platform driver ret: %d, use wlan_mac.bin",