wifi: mac80211: Do not schedule stopped TXQs

[ Upstream commit 11e3e22fa533f5d7cf04e32343b05a27eda3c7a5 ]

Ignore TXQs with the flag IEEE80211_TXQ_STOP when scheduling a queue.

The flag is only set after all fragments have been dequeued and won't
allow dequeueing other frames as long as the flag is set.

For drivers using ieee80211_txq_schedule_start() this prevents an
loop trying to push the queued frames while IEEE80211_TXQ_STOP is set:

After setting IEEE80211_TXQ_STOP the driver will call
ieee80211_return_txq(). Which calls __ieee80211_schedule_txq(), detects
that there sill are frames in the queue and immediately restarts the
stopped TXQ. Which can't dequeue any frame and thus starts over the loop.

Signed-off-by: Alexander Wetzel <Alexander@wetzel-home.de>
Fixes: ba8c3d6f16a1 ("mac80211: add an intermediate software queue implementation")
Link: https://patch.msgid.link/20250717162547.94582-2-Alexander@wetzel-home.de
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index d58b80813bdd785a449c41cf92089e8859389353..4a9b258300fef11b0f540b2c0ebd07260ade7b68 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -4098,7 +4098,9 @@ void __ieee80211_schedule_txq(struct ieee80211_hw *hw,
 
        spin_lock_bh(&local->active_txq_lock[txq->ac]);
 
-       has_queue = force || txq_has_queue(txq);
+       has_queue = force ||
+                   (!test_bit(IEEE80211_TXQ_STOP, &txqi->flags) &&
+                    txq_has_queue(txq));
        if (list_empty(&txqi->schedule_order) &&
            (has_queue || ieee80211_txq_keep_active(txqi))) {
                /* If airtime accounting is active, always enqueue STAs at the