2 files changed, 17 insertions, 7 deletions

diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
index b1438fd4d876..64b544ae9966 100644
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -487,9 +487,14 @@ static ssize_t ieee80211_if_fmt_aqm(
         const struct ieee80211_sub_if_data *sdata, char *buf, int buflen)
 {
         struct ieee80211_local *local = sdata->local;
-        struct txq_info *txqi = to_txq_info(sdata->vif.txq);
+        struct txq_info *txqi;
         int len;
 
+        if (!sdata->vif.txq)
+                return 0;
+
+        txqi = to_txq_info(sdata->vif.txq);
+
         spin_lock_bh(&local->fq.lock);
         rcu_read_lock();
 
@@ -658,7 +663,9 @@ static void add_common_files(struct ieee80211_sub_if_data *sdata)
         DEBUGFS_ADD(rc_rateidx_vht_mcs_mask_5ghz);
         DEBUGFS_ADD(hw_queues);
 
-        if (sdata->local->ops->wake_tx_queue)
+        if (sdata->local->ops->wake_tx_queue &&
+            sdata->vif.type != NL80211_IFTYPE_P2P_DEVICE &&
+            sdata->vif.type != NL80211_IFTYPE_NAN)
                 DEBUGFS_ADD(aqm);
 }
 
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