mt76: only stop tx queues on offchannel, not during the entire scan

During scans, mac80211 frequently switches back to the home channel to
minimize interruption of ongoing traffic. Keep regular tx queues active
during that time.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index 915e617331313a77b3ac37e5e6b164d4678b41f9..d862e5efd094f997cf68f6a3190211c2ca186b13 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -366,6 +366,11 @@ void mt76_set_channel(struct mt76_dev *dev)
        struct mt76_channel_state *state;
        bool offchannel = hw->conf.flags & IEEE80211_CONF_OFFCHANNEL;
 
+       if (offchannel)
+               set_bit(MT76_OFFCHANNEL, &dev->state);
+       else
+               clear_bit(MT76_OFFCHANNEL, &dev->state);
+
        if (dev->drv->update_survey)
                dev->drv->update_survey(dev);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index a74e6eef51e97088400bebfa84648f3d469a87a2..2d098fac614792a6f7a9d5b8c36c5e3a006219be 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -189,6 +189,7 @@ enum {
        MT76_STATE_RUNNING,
        MT76_SCANNING,
        MT76_RESET,
+       MT76_OFFCHANNEL,
 };
 
 struct mt76_hw_cap {

diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c
index 7ecd2d7c5db4211c77bc936130980bf6c8378b06..e96956710fb2aa2b0e1293692e969fca6fd21fc5 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/tx.c
+++ b/drivers/net/wireless/mediatek/mt76/tx.c
@@ -332,7 +332,7 @@ mt76_txq_send_burst(struct mt76_dev *dev, struct mt76_queue *hwq,
                if (probe)
                        break;
 
-               if (test_bit(MT76_SCANNING, &dev->state) ||
+               if (test_bit(MT76_OFFCHANNEL, &dev->state) ||
                    test_bit(MT76_RESET, &dev->state))
                        return -EBUSY;
 
@@ -385,7 +385,7 @@ restart:
                bool empty = false;
                int cur;
 
-               if (test_bit(MT76_SCANNING, &dev->state) ||
+               if (test_bit(MT76_OFFCHANNEL, &dev->state) ||
                    test_bit(MT76_RESET, &dev->state))
                        return -EBUSY;