During changing virtual interface, keep using previous net device
mac address.

Signed-off-by: Xinming Hu <[email protected]>
---
 drivers/net/wireless/marvell/mwifiex/main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/marvell/mwifiex/main.c 
b/drivers/net/wireless/marvell/mwifiex/main.c
index b5f99a1..2f2b115 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.c
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
@@ -1333,7 +1333,10 @@ void mwifiex_init_priv_params(struct mwifiex_private 
*priv,
        priv->assocresp_idx = MWIFIEX_AUTO_IDX_MASK;
        priv->gen_idx = MWIFIEX_AUTO_IDX_MASK;
        priv->num_tx_timeout = 0;
-       ether_addr_copy(priv->curr_addr, priv->adapter->perm_addr);
+       if (is_valid_ether_addr(dev->dev_addr))
+               ether_addr_copy(priv->curr_addr, dev->dev_addr);
+       else
+               ether_addr_copy(priv->curr_addr, priv->adapter->perm_addr);
 
        if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA ||
            GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP) {
-- 
1.9.1

Reply via email to