2 files changed, 8 insertions, 4 deletions

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 79bc8709e83b..3037f49e51c8 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -2488,7 +2488,10 @@ enum ieee80211_rate_control_changed {
  *
  * @restart_complete: Called after a call to ieee80211_restart_hw(), when the
  *      reconfiguration has completed. This can help the driver implement the
- *      reconfiguration step. This callback may sleep.
+ *      reconfiguration step. Also called when reconfiguring because the
+ *      driver's resume function returned 1, as this is just like an "inline"
+ *      hardware restart. This callback may sleep.
+ *
  */
 struct ieee80211_ops {
         void (*tx)(struct ieee80211_hw *hw,
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 0ad51e14f3c8..7519018ff71a 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1358,9 +1358,9 @@ int ieee80211_reconfig(struct ieee80211_local *local)
         struct ieee80211_chanctx *ctx;
         struct sta_info *sta;
         int res, i;
-#ifdef CONFIG_PM
         bool reconfig_due_to_wowlan = false;
 
+#ifdef CONFIG_PM
         if (local->suspended)
                 local->resuming = true;
 
@@ -1656,10 +1656,11 @@ int ieee80211_reconfig(struct ieee80211_local *local)
          * If this is for hw restart things are still running.
          * We may want to change that later, however.
          */
-        if (!local->suspended) {
+        if (!local->suspended || reconfig_due_to_wowlan)
                 drv_restart_complete(local);
+
+        if (!local->suspended)
                 return 0;
-        }
 
 #ifdef CONFIG_PM
         /* first set suspended false, then resuming */