mt76: move aggr_stats array in mt76_dev

Move aggr_stats array from mt76x02_dev to mt76_dev in order to be reused
adding aggregation stats for mt7603/mt7615 drivers

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

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 888dfc58546d1e9e2d321ebca4964181f0d2dea7..b3e776ef9469885d42d036f36b99db9fd6bb1424 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -461,6 +461,8 @@ struct mt76_dev {
        u32 rev;
        unsigned long state;
 
+       u32 aggr_stats[32];
+
        u8 antenna_mask;
        u16 chainmask;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02.h b/drivers/net/wireless/mediatek/mt76/mt76x02.h
index e858bba8c8ffdeba84796ca634177734c8fcb7ca..50b0131f85bf030a2104a421802f3c93d2fa6992 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02.h
@@ -92,8 +92,6 @@ struct mt76x02_dev {
 
        const struct mt76x02_beacon_ops *beacon_ops;
 
-       u32 aggr_stats[32];
-
        struct sk_buff *beacons[8];
        u8 beacon_data_mask;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c b/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c
index 186838128c5525cc4faaaded2bc37b986759884d..68b40d63a46d7c4cead417da068f07e62ffb3a80 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c
@@ -19,7 +19,8 @@ mt76x02_ampdu_stat_read(struct seq_file *file, void *data)
                seq_puts(file, "\n");
                seq_puts(file, "Count:  ");
                for (j = 0; j < 8; j++)
-                       seq_printf(file, "%8d | ", dev->aggr_stats[i * 8 + j]);
+                       seq_printf(file, "%8d | ",
+                                  dev->mt76.aggr_stats[i * 8 + j]);
                seq_puts(file, "\n");
                seq_puts(file, "--------");
                for (j = 0; j < 8; j++)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index c681601f91140d83743876b4bc0f610b703aa4c0..0d000906b2e188f777582da2c05ff82557c3cce7 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -24,7 +24,7 @@ void mt76x02_mac_reset_counters(struct mt76x02_dev *dev)
        for (i = 0; i < 16; i++)
                mt76_rr(dev, MT_TX_STAT_FIFO);
 
-       memset(dev->aggr_stats, 0, sizeof(dev->aggr_stats));
+       memset(dev->mt76.aggr_stats, 0, sizeof(dev->mt76.aggr_stats));
 }
 EXPORT_SYMBOL_GPL(mt76x02_mac_reset_counters);
 
@@ -1119,8 +1119,8 @@ void mt76x02_mac_work(struct work_struct *work)
        for (i = 0, idx = 0; i < 16; i++) {
                u32 val = mt76_rr(dev, MT_TX_AGG_CNT(i));
 
-               dev->aggr_stats[idx++] += val & 0xffff;
-               dev->aggr_stats[idx++] += val >> 16;
+               dev->mt76.aggr_stats[idx++] += val & 0xffff;
+               dev->mt76.aggr_stats[idx++] += val >> 16;
        }
 
        if (!dev->mt76.beacon_mask)