aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-07-27 08:38:25 -0700
committerJohn W. Linville <linville@tuxdriver.com>2009-07-27 15:19:38 -0400
commit78f1a8b758d57c2d2c9f3db7199cd30803854c82 (patch)
tree53b53e50257c002004465789be1799fb9ab881e4 /net
parentiwlwifi: Read outside array bounds (diff)
downloadlinux-dev-78f1a8b758d57c2d2c9f3db7199cd30803854c82.tar.xz
linux-dev-78f1a8b758d57c2d2c9f3db7199cd30803854c82.zip
mac80211: do not queue work after suspend in the dynamic ps timer
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/mlme.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index aca22b00b6a3..07e7e41816be 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -721,7 +721,7 @@ void ieee80211_dynamic_ps_timer(unsigned long data)
{
struct ieee80211_local *local = (void *) data;
- if (local->quiescing)
+ if (local->quiescing || local->suspended)
return;
queue_work(local->hw.workqueue, &local->dynamic_ps_enable_work);