mac80211: agg-tx: call drv_wake_tx_queue in proper context

Since drv_wake_tx_queue() is normally called in the TX path, which
is already in an RCU critical section, we should call it the same
way in the aggregation code path, so if the driver expects to be
able to use RCU, it'll already be protected without having to enter
a nested critical section.

Additionally, disable soft-IRQs, since not doing so could cause
issues in a driver that relies on them already being disabled like
in the other path.

Fixes: ba8c3d6f16a1 ("mac80211: add an intermediate software queue implementation")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index 420486b5a1d9b62cba549e4c7426fef9f836d9f2..bef516ec47f94c19f57da37d80c744bb534deeb4 100644 (file)
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -226,7 +226,11 @@ ieee80211_agg_start_txq(struct sta_info *sta, int tid, bool enable)
                clear_bit(IEEE80211_TXQ_AMPDU, &txqi->flags);
 
        clear_bit(IEEE80211_TXQ_STOP, &txqi->flags);
+       local_bh_disable();
+       rcu_read_lock();
        drv_wake_tx_queue(sta->sdata->local, txqi);
+       rcu_read_unlock();
+       local_bh_enable();
 }
 
 /*