mwifiex: Do not change bss_num in change_virtual_intf

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>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index 83605a2f1c36b4d54115e7e9a69d1740ded70622..945d444d99a9d4e5447417f5ce01b183a653bfc5 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -889,23 +889,15 @@ mwifiex_init_new_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: