diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-30 10:35:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-30 10:35:45 -0700 |
| commit | a1b97440eec0ea3e53183cde8fe82ff8c1ffb091 (patch) | |
| tree | e634dc66b0094cf26281704cce56d5117b0a15f9 /net/mac80211/mlme.c | |
| parent | 27fed4175acf81ddd91d9a4ee2fd298981f60295 (diff) | |
| parent | 89c3a8aca28e6d57f2ae945d97858a372d624b81 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index aca22b00b6a..07e7e41816b 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); |