diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-12 01:13:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-12 01:13:08 +0200 |
| commit | 78d41b35a9570b7a9a45686789df5dfaeb2b7f4c (patch) | |
| tree | a28432584132a7c810b6b243795aec43544205ab /net | |
| parent | Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6 (diff) | |
| parent | libertas: fix cmdpendingq locking (diff) | |
| download | linux-78d41b35a9570b7a9a45686789df5dfaeb2b7f4c.tar.xz linux-78d41b35a9570b7a9a45686789df5dfaeb2b7f4c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
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)); |