1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/net/wireless/wl12xx/ps.c b/drivers/net/wireless/wl12xx/ps.c
index b59b67711a17..3e68a664c9de 100644
--- a/drivers/net/wireless/wl12xx/ps.c
+++ b/drivers/net/wireless/wl12xx/ps.c
@@ -118,7 +118,7 @@ int wl1271_ps_elp_wakeup(struct wl1271 *wl)
                         &compl, msecs_to_jiffies(WL1271_WAKEUP_TIMEOUT));
                 if (ret == 0) {
                         wl1271_error("ELP wakeup timeout!");
-                        ieee80211_queue_work(wl->hw, &wl->recovery_work);
+                        wl12xx_queue_recovery_work(wl);
                         ret = -ETIMEDOUT;
                         goto err;
                 } else if (ret < 0) {
@@ -169,9 +169,11 @@ int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode,
                 wl1271_debug(DEBUG_PSM, "leaving psm");
 
                 /* disable beacon early termination */
-                ret = wl1271_acx_bet_enable(wl, false);
-                if (ret < 0)
-                        return ret;
+                if (wl->band == IEEE80211_BAND_2GHZ) {
+                        ret = wl1271_acx_bet_enable(wl, false);
+                        if (ret < 0)
+                                return ret;
+                }
 
                 /* disable beacon filtering */
                 ret = wl1271_acx_beacon_filter_opt(wl, false);
@@ -202,7 +204,7 @@ static void wl1271_ps_filter_frames(struct wl1271 *wl, u8 hlid)
                         info = IEEE80211_SKB_CB(skb);
                         info->flags |= IEEE80211_TX_STAT_TX_FILTERED;
                         info->status.rates[0].idx = -1;
-                        ieee80211_tx_status(wl->hw, skb);
+                        ieee80211_tx_status_ni(wl->hw, skb);
                         filtered++;
                 }
         }