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

wifi: mt76: mt7996: 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 7f03a563
...@@ -474,10 +474,10 @@ mt7996_ampdu_stat_read_phy(struct mt7996_phy *phy, struct seq_file *file) ...@@ -474,10 +474,10 @@ mt7996_ampdu_stat_read_phy(struct mt7996_phy *phy, struct seq_file *file)
static void static void
mt7996_txbf_stat_read_phy(struct mt7996_phy *phy, struct seq_file *s) mt7996_txbf_stat_read_phy(struct mt7996_phy *phy, struct seq_file *s)
{ {
struct mt76_mib_stats *mib = &phy->mib;
static const char * const bw[] = { static const char * const bw[] = {
"BW20", "BW40", "BW80", "BW160" "BW20", "BW40", "BW80", "BW160"
}; };
struct mib_stats *mib = &phy->mib;
/* Tx Beamformer monitor */ /* Tx Beamformer monitor */
seq_puts(s, "\nTx Beamformer applied PPDU counts: "); seq_puts(s, "\nTx Beamformer applied PPDU counts: ");
...@@ -523,7 +523,7 @@ mt7996_tx_stats_show(struct seq_file *file, void *data) ...@@ -523,7 +523,7 @@ mt7996_tx_stats_show(struct seq_file *file, void *data)
{ {
struct mt7996_phy *phy = file->private; struct mt7996_phy *phy = file->private;
struct mt7996_dev *dev = phy->dev; struct mt7996_dev *dev = phy->dev;
struct mib_stats *mib = &phy->mib; struct mt76_mib_stats *mib = &phy->mib;
int i; int i;
u32 attempts, success, per; u32 attempts, success, per;
......
...@@ -2196,8 +2196,8 @@ void mt7996_reset(struct mt7996_dev *dev) ...@@ -2196,8 +2196,8 @@ void mt7996_reset(struct mt7996_dev *dev)
void mt7996_mac_update_stats(struct mt7996_phy *phy) void mt7996_mac_update_stats(struct mt7996_phy *phy)
{ {
struct mt76_mib_stats *mib = &phy->mib;
struct mt7996_dev *dev = phy->dev; struct mt7996_dev *dev = phy->dev;
struct mib_stats *mib = &phy->mib;
u8 band_idx = phy->mt76->band_idx; u8 band_idx = phy->mt76->band_idx;
u32 cnt; u32 cnt;
int i; int i;
......
...@@ -815,7 +815,7 @@ mt7996_get_stats(struct ieee80211_hw *hw, ...@@ -815,7 +815,7 @@ mt7996_get_stats(struct ieee80211_hw *hw,
{ {
struct mt7996_phy *phy = mt7996_hw_phy(hw); struct mt7996_phy *phy = mt7996_hw_phy(hw);
struct mt7996_dev *dev = mt7996_hw_dev(hw); struct mt7996_dev *dev = mt7996_hw_dev(hw);
struct mib_stats *mib = &phy->mib; struct mt76_mib_stats *mib = &phy->mib;
mutex_lock(&dev->mt76.mutex); mutex_lock(&dev->mt76.mutex);
...@@ -1221,11 +1221,11 @@ void mt7996_get_et_stats(struct ieee80211_hw *hw, ...@@ -1221,11 +1221,11 @@ void mt7996_get_et_stats(struct ieee80211_hw *hw,
struct mt7996_dev *dev = mt7996_hw_dev(hw); struct mt7996_dev *dev = mt7996_hw_dev(hw);
struct mt7996_phy *phy = mt7996_hw_phy(hw); struct mt7996_phy *phy = mt7996_hw_phy(hw);
struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv; struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;
struct mt76_mib_stats *mib = &phy->mib;
struct mt76_ethtool_worker_info wi = { struct mt76_ethtool_worker_info wi = {
.data = data, .data = data,
.idx = mvif->mt76.idx, .idx = mvif->mt76.idx,
}; };
struct mib_stats *mib = &phy->mib;
/* See mt7996_ampdu_stat_read_phy, etc */ /* See mt7996_ampdu_stat_read_phy, etc */
int i, ei = 0; int i, ei = 0;
......
...@@ -130,60 +130,6 @@ struct mt7996_vif { ...@@ -130,60 +130,6 @@ struct mt7996_vif {
u8 beacon_rates_idx; u8 beacon_rates_idx;
}; };
/* per-phy stats. */
struct mib_stats {
u32 ack_fail_cnt;
u32 fcs_err_cnt;
u32 rts_cnt;
u32 rts_retries_cnt;
u32 ba_miss_cnt;
u32 tx_mu_bf_cnt;
u32 tx_mu_mpdu_cnt;
u32 tx_mu_acked_mpdu_cnt;
u32 tx_su_acked_mpdu_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_eht_cnt;
u32 tx_bf_rx_fb_he_cnt;
u32 tx_bf_rx_fb_vht_cnt;
u32 tx_bf_rx_fb_ht_cnt;
u32 tx_bf_rx_fb_bw; /* value of last sample, not cumulative */
u32 tx_bf_rx_fb_nc_cnt;
u32 tx_bf_rx_fb_nr_cnt;
u32 tx_bf_fb_cpl_cnt;
u32 tx_bf_fb_trig_cnt;
u32 tx_ampdu_cnt;
u32 tx_stop_q_empty_cnt;
u32 tx_mpdu_attempts_cnt;
u32 tx_mpdu_success_cnt;
/* BF counter is PPDU-based, so remove MPDU-based BF counter */
u32 tx_rwp_fail_cnt;
u32 tx_rwp_need_cnt;
/* rx stats */
u32 rx_fifo_full_cnt;
u32 channel_idle_cnt;
u32 rx_vector_mismatch_cnt;
u32 rx_delimiter_fail_cnt;
u32 rx_len_mismatch_cnt;
u32 rx_mpdu_cnt;
u32 rx_ampdu_cnt;
u32 rx_ampdu_bytes_cnt;
u32 rx_ampdu_valid_subframe_cnt;
u32 rx_ampdu_valid_subframe_bytes_cnt;
u32 rx_pfdrop_cnt;
u32 rx_vec_queue_overflow_drop_cnt;
u32 rx_ba_cnt;
u32 tx_amsdu[8];
u32 tx_amsdu_cnt;
};
/* crash-dump */ /* crash-dump */
struct mt7996_crash_data { struct mt7996_crash_data {
guid_t guid; guid_t guid;
...@@ -222,7 +168,7 @@ struct mt7996_phy { ...@@ -222,7 +168,7 @@ struct mt7996_phy {
u32 rx_ampdu_ts; u32 rx_ampdu_ts;
u32 ampdu_ref; u32 ampdu_ref;
struct mib_stats mib; struct mt76_mib_stats mib;
struct mt76_channel_state state_ts; struct mt76_channel_state state_ts;
}; };
......
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