summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ath/ath6kl/init.c
diff options
context:
space:
mode:
authorVasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>2011-10-25 19:34:18 +0530
committerKalle Valo <kvalo@qca.qualcomm.com>2011-11-11 12:58:50 +0200
commitd66ea4f9d63732790ae260eccb6c991dfa7a3b32 (patch)
tree2e71b754642a1c80c72efd71bca67171e00b5b30 /drivers/net/wireless/ath/ath6kl/init.c
parent6765d0aa5ff5b92098f5e571f26904106eae6ff3 (diff)
ath6kl: Store hw mac address in struct ath6kl
WMI ready event gives the mac address, cache this mac address in struct ath6kl so that it can be used to compute the mac address for other vif in case of multi vif. Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/init.c')
-rw-r--r--drivers/net/wireless/ath/ath6kl/init.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 05d54bca3d9d..99e4a494143c 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -1504,8 +1504,16 @@ static int ath6kl_init(struct ath6kl *ar)
WIPHY_FLAG_HAVE_AP_SME;
status = ath6kl_target_config_wlan_params(ar);
- if (!status)
- goto ath6kl_init_done;
+ if (status)
+ goto err_htc_stop;
+
+ /*
+ * Set mac address which is received in ready event
+ * FIXME: Move to ath6kl_interface_add()
+ */
+ memcpy(ndev->dev_addr, ar->mac_addr, ETH_ALEN);
+
+ return status;
err_htc_stop:
ath6kl_htc_stop(ar->htc_target);