aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/ath/wil6210/cfg80211.c8
-rw-r--r--drivers/net/wireless/ath/wil6210/main.c2
2 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index 743930357061..b1bc00724cd2 100644
--- 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,
282 282
283 /* FW don't support scan after connection attempt */ 283 /* FW don't support scan after connection attempt */
284 if (test_bit(wil_status_dontscan, &wil->status)) { 284 if (test_bit(wil_status_dontscan, &wil->status)) {
285 wil_err(wil, "Scan after connect attempt not supported\n"); 285 wil_err(wil, "Can't scan now\n");
286 return -EBUSY; 286 return -EBUSY;
287 } 287 }
288 288
@@ -402,10 +402,7 @@ static int wil_cfg80211_connect(struct wiphy *wiphy,
402 402
403 memcpy(conn.bssid, bss->bssid, ETH_ALEN); 403 memcpy(conn.bssid, bss->bssid, ETH_ALEN);
404 memcpy(conn.dst_mac, bss->bssid, ETH_ALEN); 404 memcpy(conn.dst_mac, bss->bssid, ETH_ALEN);
405 /* 405
406 * FW don't support scan after connection attempt
407 */
408 set_bit(wil_status_dontscan, &wil->status);
409 set_bit(wil_status_fwconnecting, &wil->status); 406 set_bit(wil_status_fwconnecting, &wil->status);
410 407
411 rc = wmi_send(wil, WMI_CONNECT_CMDID, &conn, sizeof(conn)); 408 rc = wmi_send(wil, WMI_CONNECT_CMDID, &conn, sizeof(conn));
@@ -414,7 +411,6 @@ static int wil_cfg80211_connect(struct wiphy *wiphy,
414 mod_timer(&wil->connect_timer, 411 mod_timer(&wil->connect_timer,
415 jiffies + msecs_to_jiffies(2000)); 412 jiffies + msecs_to_jiffies(2000));
416 } else { 413 } else {
417 clear_bit(wil_status_dontscan, &wil->status);
418 clear_bit(wil_status_fwconnecting, &wil->status); 414 clear_bit(wil_status_fwconnecting, &wil->status);
419 } 415 }
420 416
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index f10a0b2a99b2..4cc1b789bd1c 100644
--- 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)
113 GFP_KERNEL); 113 GFP_KERNEL);
114 } 114 }
115 clear_bit(wil_status_fwconnecting, &wil->status); 115 clear_bit(wil_status_fwconnecting, &wil->status);
116 wil_dbg_misc(wil, "clear_bit(wil_status_dontscan)\n");
117 clear_bit(wil_status_dontscan, &wil->status);
118 break; 116 break;
119 default: 117 default:
120 /* AP-like interface and monitor: 118 /* AP-like interface and monitor: