diff options
| author |   Sharvari Harisangam <sharvari@marvell.com> | 2019-06-12 20:42:11 +0530 |
|---|---|---|
| committer |   Kalle Valo <kvalo@codeaurora.org> | 2019-06-25 07:46:59 +0300 |
| commit | 7afb94da3cd8a28ed7ae268143117bf1ac8a3371 (patch) | |
| tree | 542f56da670cde486798133e4a1c6234f52dda96 /drivers/net/wireless/marvell/mwifiex/main.c | |
| parent | mwifiex: print PCI mmap with %pK (diff) | |
| download | linux-dev-7afb94da3cd8a28ed7ae268143117bf1ac8a3371.tar.xz linux-dev-7afb94da3cd8a28ed7ae268143117bf1ac8a3371.zip | |
mwifiex: update set_mac_address logic
In set_mac_address, driver check for interfaces with same bss_type
For first STA entry, this would return 3 interfaces since all priv's have
bss_type as 0 due to kzalloc. Thus mac address gets changed for STA
unexpected. This patch adds check for first STA and avoids mac address
change. This patch also adds mac_address change for p2p based on bss_num
type.
Signed-off-by: Sharvari Harisangam <sharvari@marvell.com>
Signed-off-by: Ganapathi Bhat <gbhat@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/marvell/mwifiex/main.c')
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c index f6da8edab7f1..4c14b4865367 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.c +++ b/drivers/net/wireless/marvell/mwifiex/main.c @@ -960,10 +960,10 @@ int mwifiex_set_mac_address(struct mwifiex_private *priv, mac_addr = old_mac_addr; - if (priv->bss_type == MWIFIEX_BSS_TYPE_P2P) + if (priv->bss_type == MWIFIEX_BSS_TYPE_P2P) { mac_addr |= BIT_ULL(MWIFIEX_MAC_LOCAL_ADMIN_BIT); - - if (mwifiex_get_intf_num(priv->adapter, priv->bss_type) > 1) { + mac_addr += priv->bss_num; + } else if (priv->adapter->priv[0] != priv) { /* Set mac address based on bss_type/bss_num */ mac_addr ^= BIT_ULL(priv->bss_type + 8); mac_addr += priv->bss_num; |