From: Vladimir Kondratiev Date: Mon, 1 Dec 2014 13:33:17 +0000 (+0200) Subject: wil6210: fix recovery after scan timeout X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=60abbb6ee6efe800ffcf9d5a98666f927b75dd0e;p=deliverable%2Flinux.git 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 Signed-off-by: John W. Linville --- 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); }