summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-05-11 19:13:08 -0400
committerDavid S. Miller <davem@davemloft.net>2011-05-11 19:13:08 -0400
commit78d41b35a9570b7a9a45686789df5dfaeb2b7f4c (patch)
treea28432584132a7c810b6b243795aec43544205ab /net
parent9bbc052d5e63512b0ce4e201ea97e12fba9fda82 (diff)
parent2ae1b8b35faba31a59b153cbad07f9c15de99740 (diff)
downloadlinux-78d41b35a9570b7a9a45686789df5dfaeb2b7f4c.tar.gz
linux-78d41b35a9570b7a9a45686789df5dfaeb2b7f4c.tar.bz2
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.c4
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));