mt76: do not enable/disable pre_tbtt_tasklet in scan_start/scan_complete

Do not enable/disable pre_tbtt_tasklet tasklet in
mt76x02_sw_scan/mt76x02_sw_scan_complete since it is already done
setting the operating channel. Do run tbtt_tasklet while the device is
offchannel

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

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
index 8f899b8aa9fe766057f2d3b9531e41ceb87afc46..7b7163bc3b62355c025c37b2f3f95c62b5fdfef3 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
@@ -30,6 +30,9 @@ static void mt76x02_pre_tbtt_tasklet(unsigned long arg)
        struct sk_buff *skb;
        int i;
 
+       if (mt76_hw(dev)->conf.flags & IEEE80211_CONF_OFFCHANNEL)
+               return;
+
        mt76x02_resync_beacon_timer(dev);
 
        ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
index 5b6ac1b364e13ed7cfe370245075a183ce26f02c..6b89f7eab26c9ebbe53859880a753943e9fdb03b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
@@ -178,6 +178,9 @@ static void mt76x02u_pre_tbtt_work(struct work_struct *work)
        if (!dev->mt76.beacon_mask)
                return;
 
+       if (mt76_hw(dev)->conf.flags & IEEE80211_CONF_OFFCHANNEL)
+               return;
+
        mt76x02_resync_beacon_timer(dev);
 
        ieee80211_iterate_active_interfaces(mt76_hw(dev),

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
index 12724e96b290271d7429223487ca3607fc1f907a..ad5323447ed429a5c43a2ccc1f0d344deb5aa445 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
@@ -593,8 +593,6 @@ void mt76x02_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 {
        struct mt76x02_dev *dev = hw->priv;
 
-       if (mt76_is_mmio(dev))
-               tasklet_disable(&dev->mt76.pre_tbtt_tasklet);
        set_bit(MT76_SCANNING, &dev->mt76.state);
 }
 EXPORT_SYMBOL_GPL(mt76x02_sw_scan);
@@ -605,9 +603,6 @@ void mt76x02_sw_scan_complete(struct ieee80211_hw *hw,
        struct mt76x02_dev *dev = hw->priv;
 
        clear_bit(MT76_SCANNING, &dev->mt76.state);
-       if (mt76_is_mmio(dev))
-               tasklet_enable(&dev->mt76.pre_tbtt_tasklet);
-
        if (dev->cal.gain_init_done) {
                /* Restore AGC gain and resume calibration after scanning. */
                dev->cal.low_gain = -1;