Commit b61cc2a7 authored by Yunbo Yu's avatar Yunbo Yu Committed by Felix Fietkau

mt76: mt7603: move spin_lock_bh() to spin_lock()

It is unnecessary to call spin_lock_bh() within a tasklet.
Signed-off-by: default avatarYunbo Yu <yuyunbo519@gmail.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 0a17329a
...@@ -82,12 +82,12 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t) ...@@ -82,12 +82,12 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t)
__skb_queue_head_init(&data.q); __skb_queue_head_init(&data.q);
q = dev->mphy.q_tx[MT_TXQ_BEACON]; q = dev->mphy.q_tx[MT_TXQ_BEACON];
spin_lock_bh(&q->lock); spin_lock(&q->lock);
ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev), ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),
IEEE80211_IFACE_ITER_RESUME_ALL, IEEE80211_IFACE_ITER_RESUME_ALL,
mt7603_update_beacon_iter, dev); mt7603_update_beacon_iter, dev);
mt76_queue_kick(dev, q); mt76_queue_kick(dev, q);
spin_unlock_bh(&q->lock); spin_unlock(&q->lock);
/* Flush all previous CAB queue packets */ /* Flush all previous CAB queue packets */
mt76_wr(dev, MT_WF_ARB_CAB_FLUSH, GENMASK(30, 16) | BIT(0)); mt76_wr(dev, MT_WF_ARB_CAB_FLUSH, GENMASK(30, 16) | BIT(0));
...@@ -117,7 +117,7 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t) ...@@ -117,7 +117,7 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t)
mt76_skb_set_moredata(data.tail[i], false); mt76_skb_set_moredata(data.tail[i], false);
} }
spin_lock_bh(&q->lock); spin_lock(&q->lock);
while ((skb = __skb_dequeue(&data.q)) != NULL) { while ((skb = __skb_dequeue(&data.q)) != NULL) {
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
struct ieee80211_vif *vif = info->control.vif; struct ieee80211_vif *vif = info->control.vif;
...@@ -126,7 +126,7 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t) ...@@ -126,7 +126,7 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t)
mt76_tx_queue_skb(dev, q, skb, &mvif->sta.wcid, NULL); mt76_tx_queue_skb(dev, q, skb, &mvif->sta.wcid, NULL);
} }
mt76_queue_kick(dev, q); mt76_queue_kick(dev, q);
spin_unlock_bh(&q->lock); spin_unlock(&q->lock);
for (i = 0; i < ARRAY_SIZE(data.count); i++) for (i = 0; i < ARRAY_SIZE(data.count); i++)
mt76_wr(dev, MT_WF_ARB_CAB_COUNT_B0_REG(i), mt76_wr(dev, MT_WF_ARB_CAB_COUNT_B0_REG(i),
......
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