Commit fb7d95c6 authored by Felix Fietkau's avatar Felix Fietkau

mt76: drop rcu read lock in mt76_rx_aggr_stop

A rcu read locked section is not allowed to sleep, and the rcu lock here
isn't actually necessary, because we're holding dev->mutex.
Fixes an issue when the tid work item is still running while freeing
a station or stopping the aggregation session
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 1a817fa7
...@@ -277,17 +277,13 @@ static void mt76_rx_aggr_shutdown(struct mt76_dev *dev, struct mt76_rx_tid *tid) ...@@ -277,17 +277,13 @@ static void mt76_rx_aggr_shutdown(struct mt76_dev *dev, struct mt76_rx_tid *tid)
void mt76_rx_aggr_stop(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tidno) void mt76_rx_aggr_stop(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tidno)
{ {
struct mt76_rx_tid *tid; struct mt76_rx_tid *tid = NULL;
rcu_read_lock();
tid = rcu_dereference(wcid->aggr[tidno]); rcu_swap_protected(wcid->aggr[tidno], tid,
lockdep_is_held(&dev->mutex));
if (tid) { if (tid) {
rcu_assign_pointer(wcid->aggr[tidno], NULL);
mt76_rx_aggr_shutdown(dev, tid); mt76_rx_aggr_shutdown(dev, tid);
kfree_rcu(tid, rcu_head); kfree_rcu(tid, rcu_head);
} }
rcu_read_unlock();
} }
EXPORT_SYMBOL_GPL(mt76_rx_aggr_stop); EXPORT_SYMBOL_GPL(mt76_rx_aggr_stop);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment