diff options
| author | Luciano Coelho <coelho@ti.com> | 2011-05-03 21:40:08 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-10 15:35:43 -0400 |
| commit | 5db1c07ced19b2eec3a149a3c624d88e02e246ae (patch) | |
| tree | 873165bf02bfdbb5822fe6e9a5f0ba96dd70f2db /net | |
| parent | 16b345d89686ca0482a9ca741a1167def1abdd7f (diff) | |
| download | linux-5db1c07ced19b2eec3a149a3c624d88e02e246ae.tar.gz linux-5db1c07ced19b2eec3a149a3c624d88e02e246ae.tar.bz2 linux-5db1c07ced19b2eec3a149a3c624d88e02e246ae.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/tx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index ce4596ed1268..bd1224fd216a 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -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)); |