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);