Commit 32cee999 authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman

staging: wilc1000: get mac address after setting drv handler

This patch moves wilc_get_mac_address and address memcpy function after
calling wilc_set_wif_drv_handler to get selected mac address.
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ec450483
...@@ -1018,12 +1018,8 @@ int wilc_mac_open(struct net_device *ndev) ...@@ -1018,12 +1018,8 @@ int wilc_mac_open(struct net_device *ndev)
return ret; return ret;
} }
wilc_get_mac_address(vif, mac_add);
PRINT_D(INIT_DBG, "Mac address: %pM\n", mac_add);
for (i = 0; i < wl->vif_num; i++) { for (i = 0; i < wl->vif_num; i++) {
if (ndev == wl->vif[i]->ndev) { if (ndev == wl->vif[i]->ndev) {
memcpy(wl->vif[i]->src_addr, mac_add, ETH_ALEN);
if (vif->iftype == AP_MODE) { if (vif->iftype == AP_MODE) {
wilc_set_wfi_drv_handler(vif, wilc_set_wfi_drv_handler(vif,
wilc_get_vif_idx(vif), wilc_get_vif_idx(vif),
...@@ -1044,6 +1040,11 @@ int wilc_mac_open(struct net_device *ndev) ...@@ -1044,6 +1040,11 @@ int wilc_mac_open(struct net_device *ndev)
1); 1);
} }
wilc_set_operation_mode(vif, vif->iftype); wilc_set_operation_mode(vif, vif->iftype);
wilc_get_mac_address(vif, mac_add);
netdev_dbg(ndev, "Mac address: %pM\n", mac_add);
memcpy(wl->vif[i]->src_addr, mac_add, ETH_ALEN);
break; break;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment