From: Johannes Berg Date: Thu, 22 Jun 2017 10:20:28 +0000 (+0200) Subject: mac80211: agg-tx: call drv_wake_tx_queue in proper context X-Git-Tag: v4.14-rc1~82^2~24^2~5 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=979e1f08042b83152dfe3d76df10db31eb7edf98;p=uclinux-h8%2Flinux.git 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 --- diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index 420486b5a1d9..bef516ec47f9 100644 --- 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(); } /*