diff mbox

[1/2] mwifiex: Do not change bss_num in change_virtual_intf

Message ID 1501751608-12829-1-git-send-email-huxinming820@gmail.com (mailing list archive)
State Accepted
Commit 2d33140f90e805cc848dbdc0b176eb67e96b2cf5
Delegated to: Kalle Valo
Headers show

Commit Message

Xinming Hu Aug. 3, 2017, 9:13 a.m. UTC 
From: Xinming Hu <huxm@marvell.com>

Commit "mwifiex: Do not change bss_type in change_virtual_intf"
Keep original bss_type unchanged. bss_num should keep the same
style, in this way. Unique tuple (bss_type, bss_num) will be
able to locate the right priv structure.

Signed-off-by: Xinming Hu <huxm@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Ganapathi Bhat <gbhat@marvell.com>
---
 drivers/net/wireless/marvell/mwifiex/cfg80211.c | 8 --------
 1 file changed, 8 deletions(-)

Comments

Kalle Valo Aug. 3, 2017, 9:20 a.m. UTC | #1 
Xinming Hu <huxinming820@gmail.com> writes:

> From: Xinming Hu <huxm@marvell.com>
>
> Commit "mwifiex: Do not change bss_type in change_virtual_intf"
> Keep original bss_type unchanged. bss_num should keep the same
> style, in this way. Unique tuple (bss_type, bss_num) will be
> able to locate the right priv structure.

The preferred way to reference commits is:

Commit 4d7ab36f0c47 ("mwifiex: Do not change bss_type in
change_virtual_intf") kept original bss_type unchanged. bss_num should
keep the same style, in this way. Unique tuple (bss_type, bss_num) will
be able to locate the right priv structure.

I can fix that during commit.
Kalle Valo Aug. 8, 2017, 11:49 a.m. UTC | #2 
Xinming Hu <huxinming820@gmail.com> wrote:

> From: Xinming Hu <huxm@marvell.com>
> 
> Commit 4d7ab36f0c47 ("mwifiex: Do not change bss_type in
> change_virtual_intf") kept original bss_type unchanged. bss_num should
> keep the same style, in this way. Unique tuple (bss_type, bss_num) will
> be able to locate the right priv structure.
> 
> Signed-off-by: Xinming Hu <huxm@marvell.com>
> Signed-off-by: Cathy Luo <cluo@marvell.com>
> Signed-off-by: Ganapathi Bhat <gbhat@marvell.com>

2 patches applied to wireless-drivers-next.git, thanks.

2d33140f90e8 mwifiex: Do not change bss_num in change_virtual_intf
20e5476d6c30 mwifiex: wrapper wps ie in pass through tlv
diff mbox

Patch

diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index 820475a..58720c9 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -893,23 +893,15 @@  static int mwifiex_deinit_priv_params(struct mwifiex_private *priv)
 	switch (type) {
 	case NL80211_IFTYPE_STATION:
 	case NL80211_IFTYPE_ADHOC:
-		priv->bss_num = mwifiex_get_unused_bss_num(adapter,
-			 MWIFIEX_BSS_TYPE_STA);
 		priv->bss_role =  MWIFIEX_BSS_ROLE_STA;
 		break;
 	case NL80211_IFTYPE_P2P_CLIENT:
-		priv->bss_num = mwifiex_get_unused_bss_num(adapter,
-			 MWIFIEX_BSS_TYPE_P2P);
 		priv->bss_role =  MWIFIEX_BSS_ROLE_STA;
 		break;
 	case NL80211_IFTYPE_P2P_GO:
-		priv->bss_num = mwifiex_get_unused_bss_num(adapter,
-			 MWIFIEX_BSS_TYPE_P2P);
 		priv->bss_role =  MWIFIEX_BSS_ROLE_UAP;
 		break;
 	case NL80211_IFTYPE_AP:
-		priv->bss_num = mwifiex_get_unused_bss_num(adapter,
-			 MWIFIEX_BSS_TYPE_UAP);
 		priv->bss_role = MWIFIEX_BSS_ROLE_UAP;
 		break;
 	default: