diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-29 12:42:14 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-29 12:42:14 -0400 |
| commit | 8732baafc3f19e69df683c3f0f36c13cec746fb9 (patch) | |
| tree | 9059d0fe8f2a49425edab88ea8e7d5337e13e66c /net/mac80211/pm.c | |
| parent | 7a9bc9b81a5bc6e44ebc80ef781332e4385083f2 (diff) | |
| parent | 42fb0b0278e6b9a44bee8adec051de5f43e10b2b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
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 98c128be382..5c572e7a1a7 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); |