wil6210: do not reset FW in STA to P2P client interface switch

Currently the FW is reset on every interface type change, because
of various FW bugs.
FW reset is not required when switching from STA to P2P client, hence
can be skipped.

Signed-off-by: Alexei Avshalom Lazar <ailizaro@codeaurora.org>
Signed-off-by: Maya Erez <merez@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index ca77d7a48f5db7abcbaa1af7fed1dab7330127e6..f94fe428c501acad8b0d31fdbc883b9ab6867a75 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -643,6 +643,16 @@ out:
        return rc;
 }
 
+static bool wil_is_safe_switch(enum nl80211_iftype from,
+                              enum nl80211_iftype to)
+{
+       if (from == NL80211_IFTYPE_STATION &&
+           to == NL80211_IFTYPE_P2P_CLIENT)
+               return true;
+
+       return false;
+}
+
 static int wil_cfg80211_change_iface(struct wiphy *wiphy,
                                     struct net_device *ndev,
                                     enum nl80211_iftype type,
@@ -668,7 +678,8 @@ static int wil_cfg80211_change_iface(struct wiphy *wiphy,
         * because it can cause significant disruption
         */
        if (!wil_has_other_active_ifaces(wil, ndev, true, false) &&
-           netif_running(ndev) && !wil_is_recovery_blocked(wil)) {
+           netif_running(ndev) && !wil_is_recovery_blocked(wil) &&
+           !wil_is_safe_switch(wdev->iftype, type)) {
                wil_dbg_misc(wil, "interface is up. resetting...\n");
                mutex_lock(&wil->mutex);
                __wil_down(wil);