aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>2014-12-01 15:33:17 +0200
committerJohn W. Linville <linville@tuxdriver.com>2014-12-01 15:57:22 -0500
commit60abbb6ee6efe800ffcf9d5a98666f927b75dd0e (patch)
tree4c40c44b229e5dbf53834bbe39d25ca02e125cf3 /drivers/net/wireless
parentwil6210: add handling of RX HTRSH interrupt (diff)
downloadlinux-dev-60abbb6ee6efe800ffcf9d5a98666f927b75dd0e.tar.xz
linux-dev-60abbb6ee6efe800ffcf9d5a98666f927b75dd0e.zip
wil6210: fix recovery after scan timeout
Scan timeout treated as indication for firmware error; and should be handled in the same way. Recovery state machine does not perform as designed because its state is not updated in case of scan timeout. Fix is to set recovery state machine into the proper state. Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath/wil6210/main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index 151ff6bbce7c..3bef1535603b 100644
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -220,6 +220,7 @@ static void wil_scan_timer_fn(ulong x)
clear_bit(wil_status_fwready, &wil->status);
wil_err(wil, "Scan timeout detected, start fw error recovery\n");
+ wil->recovery_state = fw_recovery_pending;
schedule_work(&wil->fw_error_worker);
}