wil6210: enable scan while connected

New firmware do support scan while connected. Enable it.

Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index 74393035706168e3cae5eebf7ed3f9561c928b35..b1bc00724cd23bff62fa7312c4aee9e4b4af0c58 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -282,7 +282,7 @@ static int wil_cfg80211_scan(struct wiphy *wiphy,
 
        /* FW don't support scan after connection attempt */
        if (test_bit(wil_status_dontscan, &wil->status)) {
-               wil_err(wil, "Scan after connect attempt not supported\n");
+               wil_err(wil, "Can't scan now\n");
                return -EBUSY;
        }
 
@@ -402,10 +402,7 @@ static int wil_cfg80211_connect(struct wiphy *wiphy,
 
        memcpy(conn.bssid, bss->bssid, ETH_ALEN);
        memcpy(conn.dst_mac, bss->bssid, ETH_ALEN);
-       /*
-        * FW don't support scan after connection attempt
-        */
-       set_bit(wil_status_dontscan, &wil->status);
+
        set_bit(wil_status_fwconnecting, &wil->status);
 
        rc = wmi_send(wil, WMI_CONNECT_CMDID, &conn, sizeof(conn));
@@ -414,7 +411,6 @@ static int wil_cfg80211_connect(struct wiphy *wiphy,
                mod_timer(&wil->connect_timer,
                          jiffies + msecs_to_jiffies(2000));
        } else {
-               clear_bit(wil_status_dontscan, &wil->status);
                clear_bit(wil_status_fwconnecting, &wil->status);
        }
 

diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index f10a0b2a99b2aeeac10cc4a52c9834e23769d096..4cc1b789bd1cfd928c7e98e9b19205ed8b29ab66 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -113,8 +113,6 @@ static void _wil6210_disconnect(struct wil6210_priv *wil, void *bssid)
                                                GFP_KERNEL);
                }
                clear_bit(wil_status_fwconnecting, &wil->status);
-               wil_dbg_misc(wil, "clear_bit(wil_status_dontscan)\n");
-               clear_bit(wil_status_dontscan, &wil->status);
                break;
        default:
                /* AP-like interface and monitor: