Эх сурвалжийг харах

wil6210: fix false "scan timeout"

When sending scan request, if hardware is not ready, scan timer was started
and scan timeout mis-reported.

Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Vladimir Kondratiev 11 жил өмнө
parent
commit
a21420864a

+ 3 - 1
drivers/net/wireless/ath/wil6210/cfg80211.c

@@ -311,8 +311,10 @@ static int wil_cfg80211_scan(struct wiphy *wiphy,
 	rc = wmi_send(wil, WMI_START_SCAN_CMDID, &cmd, sizeof(cmd.cmd) +
 	rc = wmi_send(wil, WMI_START_SCAN_CMDID, &cmd, sizeof(cmd.cmd) +
 			cmd.cmd.num_channels * sizeof(cmd.cmd.channel_list[0]));
 			cmd.cmd.num_channels * sizeof(cmd.cmd.channel_list[0]));
 
 
-	if (rc)
+	if (rc) {
+		del_timer_sync(&wil->scan_timer);
 		wil->scan_request = NULL;
 		wil->scan_request = NULL;
+	}
 
 
 	return rc;
 	return rc;
 }
 }