summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAniket Nagarnaik <aniketn@marvell.com>2015-07-16 08:48:43 -0700
committerKalle Valo <kvalo@codeaurora.org>2015-07-21 18:09:53 +0300
commite79801ffe9c862597750359b8c6825f3a3bfaa4f (patch)
tree41ace369fa741accc6a3a3be2f0bf6163e0bc9d4
parent0c6303cc06954c336a8221522e9ddf056125afab (diff)
downloadop-kernel-dev-e79801ffe9c862597750359b8c6825f3a3bfaa4f.zip
op-kernel-dev-e79801ffe9c862597750359b8c6825f3a3bfaa4f.tar.gz
mwifiex: correct p2p and station interface counters
While changing interface type from p2p client or p2p go to station, we should update counters for p2p interface and station interface. Also calling mwifiex_cfg80211_deinit_p2p method instead of mwifiex_cfg80211_init_p2p_client method to deinit p2p interface. Signed-off-by: Aniket Nagarnaik <aniketn@marvell.com> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r--drivers/net/wireless/mwifiex/cfg80211.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index d4b3277..ff63cb5 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -1145,8 +1145,10 @@ mwifiex_cfg80211_change_virtual_intf(struct wiphy *wiphy,
case NL80211_IFTYPE_P2P_GO:
switch (type) {
case NL80211_IFTYPE_STATION:
- if (mwifiex_cfg80211_init_p2p_client(priv))
+ if (mwifiex_cfg80211_deinit_p2p(priv))
return -EFAULT;
+ priv->adapter->curr_iface_comb.p2p_intf--;
+ priv->adapter->curr_iface_comb.sta_intf++;
dev->ieee80211_ptr->iftype = type;
break;
case NL80211_IFTYPE_ADHOC:
OpenPOWER on IntegriCloud