Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ede9500 authored Feb 10, 2014 by Arik Nemtsov Committed by John W. Linville Feb 13, 2014

wlcore: decrease warning verbosity during recovery



Silently ignore repetitive scheduling of recovery work and commands
being passed to the bus when the HW is not available. This can happen
many times during recovery and slow it down. It also spams the kernel
logs.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 41ed1a78

drivers/net/wireless/ti/wlcore/cmd.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ static int __wlcore_cmd_send(struct wl1271 wl, u16 id, void buf,
		u16 status;
		u16 poll_count = 0;

		if (WARN_ON(wl->state == WLCORE_STATE_RESTARTING &&
		if (unlikely(wl->state == WLCORE_STATE_RESTARTING &&
		id != CMD_STOP_FWLOGGER))
		return -EIO;

drivers/net/wireless/ti/wlcore/main.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -782,10 +782,11 @@ out:

		void wl12xx_queue_recovery_work(struct wl1271 *wl)
		{
		WARN_ON(!test_bit(WL1271_FLAG_INTENDED_FW_RECOVERY, &wl->flags));

		/* Avoid a recursive recovery */
		if (wl->state == WLCORE_STATE_ON) {
		WARN_ON(!test_bit(WL1271_FLAG_INTENDED_FW_RECOVERY,
		&wl->flags));

		wl->state = WLCORE_STATE_RESTARTING;
		set_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags);
		wl1271_ps_elp_wakeup(wl);