mt76: remove offchannel check in tx scheduling

tx queues are already disabled by mac80211 during scanning or other
off-channel activity. There is no need to repeat the check in mt76,
since scheduled queues are selected by mac80211 as well.

Signed-off-by: Balakrishna Bandi <b.balakrishna@globaledgesoft.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index 32ddbf0888176f0785f93def912f9cd3873f1258..fa481d2f11bd200f42c72c0917a136f8fd526f32 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -406,11 +406,6 @@ void mt76_set_channel(struct mt76_dev *dev)
        bool offchannel = hw->conf.flags & IEEE80211_CONF_OFFCHANNEL;
        int timeout = HZ / 5;
 
-       if (offchannel)
-               set_bit(MT76_OFFCHANNEL, &dev->state);
-       else
-               clear_bit(MT76_OFFCHANNEL, &dev->state);
-
        wait_event_timeout(dev->tx_wait, !mt76_has_tx_pending(dev), timeout);
 
        if (dev->drv->update_survey)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 38f2b17581efc39e058ebc460e2c2eff8e679787..d67c6a26c87cebd3ad11bec7957a12926320bbe4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -272,7 +272,6 @@ enum {
        MT76_STATE_MCU_RUNNING,
        MT76_SCANNING,
        MT76_RESET,
-       MT76_OFFCHANNEL,
        MT76_REMOVED,
        MT76_READING_STATS,
 };

diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c
index d7982aa83c115b558ce86a2437aaf12d316749a7..c22a05f06fd0a8dd77cc32ba687cfbd86a36c64b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/tx.c
+++ b/drivers/net/wireless/mediatek/mt76/tx.c
@@ -427,8 +427,7 @@ mt76_txq_send_burst(struct mt76_dev *dev, struct mt76_sw_queue *sq,
                if (probe)
                        break;
 
-               if (test_bit(MT76_OFFCHANNEL, &dev->state) ||
-                   test_bit(MT76_RESET, &dev->state))
+               if (test_bit(MT76_RESET, &dev->state))
                        return -EBUSY;
 
                skb = mt76_txq_dequeue(dev, mtxq, false);
@@ -487,8 +486,7 @@ mt76_txq_schedule_list(struct mt76_dev *dev, enum mt76_txq_id qid)
                if (sq->swq_queued >= 4)
                        break;
 
-               if (test_bit(MT76_OFFCHANNEL, &dev->state) ||
-                   test_bit(MT76_RESET, &dev->state)) {
+               if (test_bit(MT76_RESET, &dev->state)) {
                        ret = -EBUSY;
                        break;
                }