mt76: mt7921: remove mt7921_sta_stats

mt7921_sta_stats is no longer needed

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

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index 68ab61d4f0610179896400c3906f338f8acd2038..3684b3bafca0b3802af2455a9778c5b48050eda3 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -968,9 +968,9 @@ int mt7921_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
        if (sta) {
                struct mt7921_sta *msta = (struct mt7921_sta *)sta->drv_priv;
 
-               if (time_after(jiffies, msta->stats.jiffies + HZ / 4)) {
+               if (time_after(jiffies, msta->last_txs + HZ / 4)) {
                        info->flags |= IEEE80211_TX_CTL_REQ_TX_STATUS;
-                       msta->stats.jiffies = jiffies;
+                       msta->last_txs = jiffies;
                }
        }
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index 8a7b4e78c0973f83ce8c9c477033673f0661fdad..217ed7055aa05d479fe588ced50d369b200c713f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -586,7 +586,7 @@ int mt7921_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
        msta->wcid.idx = idx;
        msta->wcid.ext_phy = mvif->mt76.band_idx;
        msta->wcid.tx_info |= MT_WCID_TX_INFO_SET;
-       msta->stats.jiffies = jiffies;
+       msta->last_txs = jiffies;
 
        ret = mt76_connac_pm_wake(&dev->mphy, &dev->pm);
        if (ret)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
index 61fa53af3840acd2b44c1496dcd4f13d596fade4..a6caca73fddaf16979af32fb5bf92471fc129c4e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
@@ -65,15 +65,6 @@ enum mt7921_rxq_id {
        MT7921_RXQ_MCU_WM = 0,
 };
 
-struct mt7921_sta_stats {
-       struct rate_info prob_rate;
-       struct rate_info tx_rate;
-
-       unsigned long per;
-       unsigned long changed;
-       unsigned long jiffies;
-};
-
 struct mt7921_sta_key_conf {
        s8 keyidx;
        u8 key[16];
@@ -87,8 +78,7 @@ struct mt7921_sta {
        struct list_head poll_list;
        u32 airtime_ac[8];
 
-       struct mt7921_sta_stats stats;
-
+       unsigned long last_txs;
        unsigned long ampdu_state;
 
        struct mt7921_sta_key_conf bip;