wifi: mt76: mt7921: rely on mib_stats shared definition

Get rid of private copy of mib_stats structure.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c
index d6b6edb..d6c66e7 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c
@@ -95,7 +95,7 @@ mt7921_tx_stats_show(struct seq_file *file, void *data)
 {
        struct mt7921_dev *dev = file->private;
        struct mt7921_phy *phy = &dev->phy;
-       struct mib_stats *mib = &phy->mib;
+       struct mt76_mib_stats *mib = &phy->mib;
        int i;
 
        mt7921_mutex_acquire(dev);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index a671c60..a2e9d7b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -952,8 +952,8 @@ EXPORT_SYMBOL_GPL(mt7921_reset);
 
 void mt7921_mac_update_mib_stats(struct mt7921_phy *phy)
 {
+       struct mt76_mib_stats *mib = &phy->mib;
        struct mt7921_dev *dev = phy->dev;
-       struct mib_stats *mib = &phy->mib;
        int i, aggr0 = 0, aggr1;
        u32 val;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index 0e3ada1..d183982 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -995,7 +995,7 @@ mt7921_get_stats(struct ieee80211_hw *hw,
                 struct ieee80211_low_level_stats *stats)
 {
        struct mt7921_phy *phy = mt7921_hw_phy(hw);
-       struct mib_stats *mib = &phy->mib;
+       struct mt76_mib_stats *mib = &phy->mib;
 
        mt7921_mutex_acquire(phy->dev);
 
@@ -1133,7 +1133,7 @@ void mt7921_get_et_stats(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
        int stats_size = ARRAY_SIZE(mt7921_gstrings_stats);
        struct mt7921_phy *phy = mt7921_hw_phy(hw);
        struct mt7921_dev *dev = phy->dev;
-       struct mib_stats *mib = &phy->mib;
+       struct mt76_mib_stats *mib = &phy->mib;
        struct mt76_ethtool_worker_info wi = {
                .data = data,
                .idx = mvif->mt76.idx,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
index 149acb1..76dc253 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
@@ -179,35 +179,6 @@ struct mt7921_vif {
        struct ieee80211_chanctx_conf *ctx;
 };
 
-struct mib_stats {
-       u32 ack_fail_cnt;
-       u32 fcs_err_cnt;
-       u32 rts_cnt;
-       u32 rts_retries_cnt;
-       u32 ba_miss_cnt;
-
-       u32 tx_bf_ibf_ppdu_cnt;
-       u32 tx_bf_ebf_ppdu_cnt;
-       u32 tx_bf_rx_fb_all_cnt;
-       u32 tx_bf_rx_fb_he_cnt;
-       u32 tx_bf_rx_fb_vht_cnt;
-       u32 tx_bf_rx_fb_ht_cnt;
-
-       u32 tx_ampdu_cnt;
-       u32 tx_mpdu_attempts_cnt;
-       u32 tx_mpdu_success_cnt;
-       u32 tx_pkt_ebf_cnt;
-       u32 tx_pkt_ibf_cnt;
-
-       u32 rx_mpdu_cnt;
-       u32 rx_ampdu_cnt;
-       u32 rx_ampdu_bytes_cnt;
-       u32 rx_ba_cnt;
-
-       u32 tx_amsdu[8];
-       u32 tx_amsdu_cnt;
-};
-
 enum {
        MT7921_CLC_POWER,
        MT7921_CLC_CHAN,
@@ -247,7 +218,7 @@ struct mt7921_phy {
        u32 rx_ampdu_ts;
        u32 ampdu_ref;
 
-       struct mib_stats mib;
+       struct mt76_mib_stats mib;
 
        u8 sta_work_count;