diff mbox series

[09/11] mwifiex: update set_mac_address logic

Message ID 1560352331-16898-1-git-send-email-gbhat@marvell.com (mailing list archive)
State Accepted
Commit 7afb94da3cd8a28ed7ae268143117bf1ac8a3371
Delegated to: Kalle Valo
Headers show
Series None | expand

Commit Message

Ganapathi Bhat June 12, 2019, 3:12 p.m. UTC 
From: Sharvari Harisangam <sharvari@marvell.com>

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>
---
 drivers/net/wireless/marvell/mwifiex/main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Ganapathi Bhat June 12, 2019, 3:18 p.m. UTC | #1 
Hi Kalle,

This change is correct one, but I missed changing the .patch file name before sending. Let me know if this needs to be resend.

Regards,
Ganapathi
Kalle Valo June 20, 2019, 8:08 a.m. UTC | #2 
Ganapathi Bhat <gbhat@marvell.com> writes:

> This change is correct one, but I missed changing the .patch file name before sending. Let me know if this needs to be resend.

I don't understand your comment. Are you saying that even if this is
marked as "9/11" this was supposed to submitted as a single patch? If
that's the case, no need to resend.
Ganapathi Bhat June 20, 2019, 8:18 a.m. UTC | #3 
Hi Kalle,

> I don't understand your comment. Are you saying that even if this is marked
> as "9/11" this was supposed to submitted as a single patch? If that's the case,
> no need to resend.


Yes; That is the case;

Thanks,
Ganapathi
Kalle Valo June 25, 2019, 4:47 a.m. UTC | #4 
Ganapathi Bhat <gbhat@marvell.com> wrote:

> From: Sharvari Harisangam <sharvari@marvell.com>
> 
> 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>

Patch applied to wireless-drivers-next.git, thanks.

7afb94da3cd8 mwifiex: update set_mac_address logic
diff mbox series

Patch

diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
index 5ed2d9b..4eabd94 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.c
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
@@ -965,10 +965,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;