diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-22 22:39:53 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-22 22:39:53 +0400 |
| commit | 133189a46c2c522eb4ef26b1ede63dd0a9fdc920 (patch) | |
| tree | 04ab3567c3bea31503c4dfa94909f99dc4b3789f /net/mac80211/pm.c | |
| parent | f761b6947dde42890beea59b020e1be87491809e (diff) | |
| parent | 0f6b3f597daab2254614e2773e322e73fb1b6f4b (diff) | |
| download | linux-133189a46c2c522eb4ef26b1ede63dd0a9fdc920.tar.xz | |
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
Diffstat (limited to 'net/mac80211/pm.c')
| -rw-r--r-- | net/mac80211/pm.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c index 98c128be3827..5c572e7a1a71 100644 --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c @@ -78,6 +78,16 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) if (err < 0) { local->quiescing = false; local->wowlan = false; + if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) { + mutex_lock(&local->sta_mtx); + list_for_each_entry(sta, + &local->sta_list, list) { + clear_sta_flag(sta, WLAN_STA_BLOCK_BA); + } + mutex_unlock(&local->sta_mtx); + } + ieee80211_wake_queues_by_reason(hw, + IEEE80211_QUEUE_STOP_REASON_SUSPEND); return err; } else if (err > 0) { WARN_ON(err != 1); |