1 files changed, 4 insertions, 8 deletions

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 677422e11e07..81a27516813e 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -73,9 +73,10 @@ bool __ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata)
         return false;
 }
 
-void ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata)
+void ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata,
+                              bool update_bss)
 {
-        if (__ieee80211_recalc_txpower(sdata))
+        if (__ieee80211_recalc_txpower(sdata) || update_bss)
                 ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_TXPOWER);
 }
 
@@ -1169,12 +1170,7 @@ static void ieee80211_iface_work(struct work_struct *work)
         if (local->scanning)
                 return;
 
-        /*
-         * ieee80211_queue_work() should have picked up most cases,
-         * here we'll pick the rest.
-         */
-        if (WARN(local->suspended,
-                 "interface work scheduled while going to suspend\n"))
+        if (!ieee80211_can_run_worker(local))
                 return;
 
         /* first process frames */