Skip to content

Commit

Permalink
wlcore: don't issue SLEEP_AUTH command during recovery
Browse files Browse the repository at this point in the history
During interface removal, don't adjust sleep_auth if we are during
recovery. Since the FW is potentially dead we shouldn't talk to it.

Reported-by: Yossi Wortzel <yossiw@ti.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
  • Loading branch information
Arik Nemtsov authored and Luciano Coelho committed Jul 18, 2012
1 parent 602c759 commit 42066f9
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion drivers/net/wireless/ti/wlcore/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2377,7 +2377,14 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
else
wl->sta_count--;

/* Last AP, have more stations. Configure according to STA. */
/*
* Last AP, have more stations. Configure sleep auth according to STA.
* Don't do thin on unintended recovery.
*/
if (test_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags) &&
!test_bit(WL1271_FLAG_INTENDED_FW_RECOVERY, &wl->flags))
goto unlock;

if (wl->ap_count == 0 && is_ap && wl->sta_count) {
u8 sta_auth = wl->conf.conn.sta_sleep_auth;
/* Configure for power according to debugfs */
Expand All @@ -2391,6 +2398,7 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
wl1271_acx_sleep_auth(wl, WL1271_PSM_ELP);
}

unlock:
mutex_unlock(&wl->mutex);

del_timer_sync(&wlvif->rx_streaming_timer);
Expand Down

0 comments on commit 42066f9

Please sign in to comment.