From c98370ec35b394dd464226e060ff76c21397ea86 Mon Sep 17 00:00:00 2001 From: Yuanyuan Liu Date: Thu, 13 Oct 2016 11:22:13 -0700 Subject: [PATCH] qcacld-3.0: Update custom MAC address before creating interface Custom MAC address has to be updated before creating WLAN interface. Otherwise, custom MAC address won't take affect as WLAN interface will use the old MAC address auto-generated or from hw_addr/config INI file. Change-Id: Icd3feda96ffe45896fec2407f4ddb4351992ed81 CRs-Fixed: 1077588 --- core/hdd/src/wlan_hdd_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index b0fc02c6397a..cf4c663ba24c 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -7413,8 +7413,6 @@ static int hdd_pre_enable_configure(hdd_context_t *hdd_ctx) goto out; } - hdd_initialize_mac_address(hdd_ctx); - /* * Set the MAC Address Currently this is used by HAL to add self sta. * Remove this once self sta is added as part of session open. @@ -7999,10 +7997,10 @@ int hdd_wlan_startup(struct device *dev) if (hdd_ipa_init(hdd_ctx) == QDF_STATUS_E_FAILURE) goto err_wiphy_unregister; + hdd_initialize_mac_address(hdd_ctx); rtnl_held = hdd_hold_rtnl_lock(); - adapter = hdd_open_interfaces(hdd_ctx, rtnl_held); if (IS_ERR(adapter)) {