aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul E. McKenney <[email protected]>2019-12-11 10:30:21 -0800
committerPaul E. McKenney <[email protected]>2019-12-12 10:20:51 -0800
commita191c9e9f73a78e8801b5eeb3d43bbd6fd73b86f (patch)
tree46d9e4445d75c9aaa98f823a225a47ad4a30e730
parent1a271ebbfe33a44f61e02d35a2950ab00b32850b (diff)
wireless/mediatek: Replace rcu_swap_protected() with rcu_replace_pointer()
This commit replaces the use of rcu_swap_protected() with the more intuitively appealing rcu_replace_pointer() as a step towards removing rcu_swap_protected(). Link: https://lore.kernel.org/lkml/CAHk-=wiAsJLw1egFEE=Z7-GGtM6wcvtyytXZA1+BHqta4gg6Hw@mail.gmail.com/ Reported-by: Linus Torvalds <[email protected]> Reported-by: "Martin K. Petersen" <[email protected]> [ paulmck: Apply Matthias Brugger feedback. ] Signed-off-by: Paul E. McKenney <[email protected]> Reviewed-by: "Martin K. Petersen" <[email protected]> Acked-by: Kalle Valo <[email protected]> Cc: Felix Fietkau <[email protected]> Cc: Lorenzo Bianconi <[email protected]> Cc: Ryder Lee <[email protected]> Cc: Roy Luo <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Matthias Brugger <[email protected]> Cc: <[email protected]> Cc: <[email protected]> Cc: <[email protected]> Cc: <[email protected]>
-rw-r--r--drivers/net/wireless/mediatek/mt76/agg-rx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/agg-rx.c b/drivers/net/wireless/mediatek/mt76/agg-rx.c
index 53b5a4b2dcc5..59c187898132 100644
--- a/drivers/net/wireless/mediatek/mt76/agg-rx.c
+++ b/drivers/net/wireless/mediatek/mt76/agg-rx.c
@@ -281,8 +281,8 @@ void mt76_rx_aggr_stop(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tidno)
{
struct mt76_rx_tid *tid = NULL;
- rcu_swap_protected(wcid->aggr[tidno], tid,
- lockdep_is_held(&dev->mutex));
+ tid = rcu_replace_pointer(wcid->aggr[tidno], tid,
+ lockdep_is_held(&dev->mutex));
if (tid) {
mt76_rx_aggr_shutdown(dev, tid);
kfree_rcu(tid, rcu_head);