Commit d7b47bbd authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau

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: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 25990ed3
...@@ -461,6 +461,8 @@ struct mt76_dev { ...@@ -461,6 +461,8 @@ struct mt76_dev {
u32 rev; u32 rev;
unsigned long state; unsigned long state;
u32 aggr_stats[32];
u8 antenna_mask; u8 antenna_mask;
u16 chainmask; u16 chainmask;
......
...@@ -92,8 +92,6 @@ struct mt76x02_dev { ...@@ -92,8 +92,6 @@ struct mt76x02_dev {
const struct mt76x02_beacon_ops *beacon_ops; const struct mt76x02_beacon_ops *beacon_ops;
u32 aggr_stats[32];
struct sk_buff *beacons[8]; struct sk_buff *beacons[8];
u8 beacon_data_mask; u8 beacon_data_mask;
......
...@@ -19,7 +19,8 @@ mt76x02_ampdu_stat_read(struct seq_file *file, void *data) ...@@ -19,7 +19,8 @@ mt76x02_ampdu_stat_read(struct seq_file *file, void *data)
seq_puts(file, "\n"); seq_puts(file, "\n");
seq_puts(file, "Count: "); seq_puts(file, "Count: ");
for (j = 0; j < 8; j++) 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, "\n");
seq_puts(file, "--------"); seq_puts(file, "--------");
for (j = 0; j < 8; j++) for (j = 0; j < 8; j++)
......
...@@ -24,7 +24,7 @@ void mt76x02_mac_reset_counters(struct mt76x02_dev *dev) ...@@ -24,7 +24,7 @@ void mt76x02_mac_reset_counters(struct mt76x02_dev *dev)
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
mt76_rr(dev, MT_TX_STAT_FIFO); 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); EXPORT_SYMBOL_GPL(mt76x02_mac_reset_counters);
...@@ -1119,8 +1119,8 @@ void mt76x02_mac_work(struct work_struct *work) ...@@ -1119,8 +1119,8 @@ void mt76x02_mac_work(struct work_struct *work)
for (i = 0, idx = 0; i < 16; i++) { for (i = 0, idx = 0; i < 16; i++) {
u32 val = mt76_rr(dev, MT_TX_AGG_CNT(i)); u32 val = mt76_rr(dev, MT_TX_AGG_CNT(i));
dev->aggr_stats[idx++] += val & 0xffff; dev->mt76.aggr_stats[idx++] += val & 0xffff;
dev->aggr_stats[idx++] += val >> 16; dev->mt76.aggr_stats[idx++] += val >> 16;
} }
if (!dev->mt76.beacon_mask) if (!dev->mt76.beacon_mask)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment