2 files changed, 4 insertions, 5 deletions

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index e8a3d3cb80d..898e9b02aaa 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -621,9 +621,6 @@ static void ieee80211_change_ps(struct ieee80211_local *local)
         struct ieee80211_conf *conf = &local->hw.conf;
 
         if (local->ps_sdata) {
-                if (!(local->ps_sdata->u.mgd.flags & IEEE80211_STA_ASSOCIATED))
-                        return;
-
                 ieee80211_enable_ps(local, local->ps_sdata);
         } else if (conf->flags & IEEE80211_CONF_PS) {
                 conf->flags &= ~IEEE80211_CONF_PS;
@@ -653,7 +650,8 @@ void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency)
                 count++;
         }
 
-        if (count == 1 && found->u.mgd.powersave) {
+        if (count == 1 && found->u.mgd.powersave &&
+            (found->u.mgd.flags & IEEE80211_STA_ASSOCIATED)) {
                 s32 beaconint_us;
 
                 if (latency < 0)
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 1aed88d922d..364222bfb10 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1415,7 +1415,8 @@ int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         if ((local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK) &&
-            local->hw.conf.dynamic_ps_timeout > 0) {
+            local->hw.conf.dynamic_ps_timeout > 0 &&
+            !local->sw_scanning && !local->hw_scanning && local->ps_sdata) {
                 if (local->hw.conf.flags & IEEE80211_CONF_PS) {
                         ieee80211_stop_queues_by_reason(&local->hw,
                                         IEEE80211_QUEUE_STOP_REASON_PS);