1 files changed, 9 insertions, 1 deletions

diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index c65ff471acce..af49ac4f0826 100644
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -97,9 +97,17 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
         /* tear down aggregation sessions and remove STAs */
         mutex_lock(&local->sta_mtx);
         list_for_each_entry(sta, &local->sta_list, list) {
-                if (sta->uploaded)
+                if (sta->uploaded) {
+                        enum ieee80211_sta_state state;
+
                         drv_sta_remove(local, sta->sdata, &sta->sta);
 
+                        state = sta->sta_state;
+                        for (; state > IEEE80211_STA_NOTEXIST; state--)
+                                WARN_ON(drv_sta_state(local, sdata, sta,
+                                                      state, state - 1));
+                }
+
                 mesh_plink_quiesce(sta);
         }
         mutex_unlock(&local->sta_mtx);