1 files changed, 8 insertions, 5 deletions

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 051a02ddcb85..32a7a53833c0 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -247,7 +247,8 @@ static void __ieee80211_wake_txqs(struct ieee80211_sub_if_data *sdata, int ac)
         struct sta_info *sta;
         int i;
 
-        spin_lock_bh(&fq->lock);
+        local_bh_disable();
+        spin_lock(&fq->lock);
 
         if (sdata->vif.type == NL80211_IFTYPE_AP)
                 ps = &sdata->bss->ps;
@@ -273,9 +274,9 @@ static void __ieee80211_wake_txqs(struct ieee80211_sub_if_data *sdata, int ac)
                                                 &txqi->flags))
                                 continue;
 
-                        spin_unlock_bh(&fq->lock);
+                        spin_unlock(&fq->lock);
                         drv_wake_tx_queue(local, txqi);
-                        spin_lock_bh(&fq->lock);
+                        spin_lock(&fq->lock);
                 }
         }
 
@@ -288,12 +289,14 @@ static void __ieee80211_wake_txqs(struct ieee80211_sub_if_data *sdata, int ac)
             (ps && atomic_read(&ps->num_sta_ps)) || ac != vif->txq->ac)
                 goto out;
 
-        spin_unlock_bh(&fq->lock);
+        spin_unlock(&fq->lock);
 
         drv_wake_tx_queue(local, txqi);
+        local_bh_enable();
         return;
 out:
-        spin_unlock_bh(&fq->lock);
+        spin_unlock(&fq->lock);
+        local_bh_enable();
 }
 
 static void