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

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

[Xinming Hu]

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(-)

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:
-- 
1.9.1

[PATCH 2/2] mwifiex: wrapper wps ie in pass through tlv

[Xinming Hu]

From: Xinming Hu <huxm@marvell.com>

This patch wrapper wps ie in pass through tlv, so that
firmware could parse correctly.

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/join.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/marvell/mwifiex/join.c b/drivers/net/wireless/marvell/mwifiex/join.c
index b89596c..d87aeff 100644
--- a/drivers/net/wireless/marvell/mwifiex/join.c
+++ b/drivers/net/wireless/marvell/mwifiex/join.c
@@ -253,7 +253,7 @@ static int mwifiex_get_common_rates(struct mwifiex_private *priv, u8 *rate1,
 			    priv->wps_ie_len, *buffer);
 
 		/* Wrap the generic IE buffer with a pass through TLV type */
-		ie_header.type = cpu_to_le16(TLV_TYPE_MGMT_IE);
+		ie_header.type = cpu_to_le16(TLV_TYPE_PASSTHROUGH);
 		ie_header.len = cpu_to_le16(priv->wps_ie_len);
 		memcpy(*buffer, &ie_header, sizeof(ie_header));
 		*buffer += sizeof(ie_header);
-- 
1.9.1

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

[Kalle Valo]

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

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

[Kalle Valo]

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

-- 
https://patchwork.kernel.org/patch/9878505/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches