mt76x2: move wcid_tx_rate conf at bootstrap

Move WCID tx rate configuration at device bootstrap since
the related register are always set to 0

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index 90d24af7f6c869841d6abf87bf23485bf05f6c76..59b336e34cb55b448cad7c491e317b06b5864ee6 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -106,9 +106,6 @@ void mt76x02_mac_wcid_setup(struct mt76x02_dev *dev, u8 idx,
 
        mt76_wr(dev, MT_WCID_ATTR(idx), attr);
 
-       mt76_wr(dev, MT_WCID_TX_RATE(idx), 0);
-       mt76_wr(dev, MT_WCID_TX_RATE(idx) + 4, 0);
-
        if (idx >= 128)
                return;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
index f6e8af6432c19cd259129c8d0856013974ed3432..7b53b2be28c28c48ebb364bbee00f72d358f3462 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
@@ -129,8 +129,11 @@ static int mt76x2_mac_reset(struct mt76x02_dev *dev, bool hard)
        for (i = 0; i < 256 / 32; i++)
                mt76_wr(dev, MT_WCID_DROP_BASE + i * 4, 0);
 
-       for (i = 0; i < 256; i++)
+       for (i = 0; i < 256; i++) {
                mt76x02_mac_wcid_setup(dev, i, 0, NULL);
+               mt76_wr(dev, MT_WCID_TX_RATE(i), 0);
+               mt76_wr(dev, MT_WCID_TX_RATE(i) + 4, 0);
+       }
 
        for (i = 0; i < MT_MAX_VIFS; i++)
                mt76x02_mac_wcid_setup(dev, MT_VIF_WCID(i), i, NULL);