mt76: remove empty flag in mt76_txq_schedule_list

Remove empty flag in mt76_txq_schedule_list and mt76_txq_send_burst
since we just need retry_q length to notify mac80211 to reschedule the
current tx queue

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c
index c22a05f06fd0a8dd77cc32ba687cfbd86a36c64b..7ee91d946882e8ab7df0e97a7e70d1fea2d2beb0 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/tx.c
+++ b/drivers/net/wireless/mediatek/mt76/tx.c
@@ -378,7 +378,7 @@ EXPORT_SYMBOL_GPL(mt76_release_buffered_frames);
 
 static int
 mt76_txq_send_burst(struct mt76_dev *dev, struct mt76_sw_queue *sq,
-                   struct mt76_txq *mtxq, bool *empty)
+                   struct mt76_txq *mtxq)
 {
        struct ieee80211_txq *txq = mtxq_to_txq(mtxq);
        enum mt76_txq_id qid = mt76_txq_get_qid(txq);
@@ -392,16 +392,12 @@ mt76_txq_send_burst(struct mt76_dev *dev, struct mt76_sw_queue *sq,
        bool probe;
        int idx;
 
-       if (test_bit(MT_WCID_FLAG_PS, &wcid->flags)) {
-               *empty = true;
+       if (test_bit(MT_WCID_FLAG_PS, &wcid->flags))
                return 0;
-       }
 
        skb = mt76_txq_dequeue(dev, mtxq, false);
-       if (!skb) {
-               *empty = true;
+       if (!skb)
                return 0;
-       }
 
        info = IEEE80211_SKB_CB(skb);
        if (!(wcid->tx_info & MT_WCID_TX_INFO_SET))
@@ -431,10 +427,8 @@ mt76_txq_send_burst(struct mt76_dev *dev, struct mt76_sw_queue *sq,
                        return -EBUSY;
 
                skb = mt76_txq_dequeue(dev, mtxq, false);
-               if (!skb) {
-                       *empty = true;
+               if (!skb)
                        break;
-               }
 
                info = IEEE80211_SKB_CB(skb);
                cur_ampdu = info->flags & IEEE80211_TX_CTL_AMPDU;
@@ -481,8 +475,6 @@ mt76_txq_schedule_list(struct mt76_dev *dev, enum mt76_txq_id qid)
 
        spin_lock_bh(&hwq->lock);
        while (1) {
-               bool empty = false;
-
                if (sq->swq_queued >= 4)
                        break;
 
@@ -513,10 +505,9 @@ mt76_txq_schedule_list(struct mt76_dev *dev, enum mt76_txq_id qid)
                        spin_lock_bh(&hwq->lock);
                }
 
-               ret += mt76_txq_send_burst(dev, sq, mtxq, &empty);
-               if (skb_queue_empty(&mtxq->retry_q))
-                       empty = true;
-               ieee80211_return_txq(dev->hw, txq, !empty);
+               ret += mt76_txq_send_burst(dev, sq, mtxq);
+               ieee80211_return_txq(dev->hw, txq,
+                                    !skb_queue_empty(&mtxq->retry_q));
        }
        spin_unlock_bh(&hwq->lock);