Commit 52a1f158 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

wifi: mt76: mt7921: rely on mib_stats shared definition 



Get rid of private copy of mib_stats structure.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 98214484

drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/mediatek/mt76/mt7921/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/mediatek/mt76/mt7921/main.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h

+1 −30
Original line number Diff line number Diff line
@@ -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;