mt76: connac: remove MT76_STATE_PM in mac_tx_free
authorLorenzo Bianconi <lorenzo@kernel.org>
Sun, 18 Apr 2021 16:45:37 +0000 (18:45 +0200)
committerFelix Fietkau <nbd@nbd.name>
Wed, 21 Apr 2021 18:55:53 +0000 (20:55 +0200)
Get rid of MT76_STATE_PM chec in mt7615_mac_tx_free and
mt7921_mac_tx_free since we already rely on mt76_connac_pm_unref in the
NAPI callback.
Remove mt76_connac_power_save_sched calls in mt7615_mac_tx_free and
mt7921_mac_tx_free

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7615/mac.c
drivers/net/wireless/mediatek/mt76/mt7921/mac.c

index e81c7d3228111048979f2c84a6ef73b1b1c4d293..ad1e236727cb2bd03aca85ca572b03e7875e5baa 100644 (file)
@@ -1514,14 +1514,10 @@ static void mt7615_mac_tx_free(struct mt7615_dev *dev, struct sk_buff *skb)
 
        dev_kfree_skb(skb);
 
-       if (test_bit(MT76_STATE_PM, &dev->phy.mt76->state))
-               return;
-
        rcu_read_lock();
        mt7615_mac_sta_poll(dev);
        rcu_read_unlock();
 
-       mt76_connac_power_save_sched(&dev->mphy, &dev->pm);
        mt76_worker_schedule(&dev->mt76.tx_worker);
 }
 
index def00b255495cc034cffdfe479d5b8a27956fa74..a8247a6d5bc7bf51c31b08497be98770a0502014 100644 (file)
@@ -1043,13 +1043,7 @@ void mt7921_mac_tx_free(struct mt7921_dev *dev, struct sk_buff *skb)
                napi_consume_skb(skb, 1);
        }
 
-       if (test_bit(MT76_STATE_PM, &dev->phy.mt76->state))
-               return;
-
        mt7921_mac_sta_poll(dev);
-
-       mt76_connac_power_save_sched(&dev->mphy, &dev->pm);
-
        mt76_worker_schedule(&dev->mt76.tx_worker);
 }