Commit 5db1c07c authored May 03, 2011 by Luciano Coelho Committed by John W. Linville May 10, 2011

mac80211: don't start the dynamic ps timer if not associated



When we are disconnecting, we set PS off, but this happens before we
send the deauth/disassoc request.  When the deauth/disassoc frames are
sent, we trigger the dynamic ps timer, which then times out and turns
PS back on.  Thus, PS remains on after disconnecting, causing problems
when associating again.

This can be fixed by preventing the timer to start when we're not
associated anymore.

Signed-off-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 16b345d8

net/mac80211/tx.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -237,6 +237,10 @@ ieee80211_tx_h_dynamic_ps(struct ieee80211_tx_data *tx)
		&local->dynamic_ps_disable_work);
		}

		/* Don't restart the timer if we're not disassociated */
		if (!ifmgd->associated)
		return TX_CONTINUE;

		mod_timer(&local->dynamic_ps_timer, jiffies +
		msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout));

Admin message