mt76: mt7915: remove mt7915_sta_stats

mt7915_sta_stats is no longer needed after tx rate reworking.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index 83660b0..4c17d11 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -1100,9 +1100,9 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
 
                msta = (struct mt7915_sta *)sta->drv_priv;
 
-               if (time_after(jiffies, msta->stats.jiffies + HZ / 4)) {
+               if (time_after(jiffies, msta->jiffies + HZ / 4)) {
                        info->flags |= IEEE80211_TX_CTL_REQ_TX_STATUS;
-                       msta->stats.jiffies = jiffies;
+                       msta->jiffies = jiffies;
                }
        }
 
@@ -1910,8 +1910,8 @@ void mt7915_mac_sta_rc_work(struct work_struct *work)
        while (!list_empty(&list)) {
                msta = list_first_entry(&list, struct mt7915_sta, rc_list);
                list_del_init(&msta->rc_list);
-               changed = msta->stats.changed;
-               msta->stats.changed = 0;
+               changed = msta->changed;
+               msta->changed = 0;
                spin_unlock_bh(&dev->sta_poll_lock);
 
                sta = container_of((void *)msta, struct ieee80211_sta, drv_priv);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
index 0228fba..48b5e20 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -623,7 +623,7 @@ int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
        msta->wcid.idx = idx;
        msta->wcid.ext_phy = mvif->band_idx;
        msta->wcid.tx_info |= MT_WCID_TX_INFO_SET;
-       msta->stats.jiffies = jiffies;
+       msta->jiffies = jiffies;
 
        mt7915_mac_wtbl_update(dev, idx,
                               MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
@@ -955,7 +955,7 @@ static void mt7915_sta_rc_work(void *data, struct ieee80211_sta *sta)
        u32 *changed = data;
 
        spin_lock_bh(&dev->sta_poll_lock);
-       msta->stats.changed |= *changed;
+       msta->changed |= *changed;
        if (list_empty(&msta->rc_list))
                list_add_tail(&msta->rc_list, &dev->sta_rc_list);
        spin_unlock_bh(&dev->sta_poll_lock);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index a9c36b5..33be449 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -64,11 +64,6 @@ enum mt7915_rxq_id {
        MT7915_RXQ_MCU_WA_EXT,
 };
 
-struct mt7915_sta_stats {
-       unsigned long changed;
-       unsigned long jiffies;
-};
-
 struct mt7915_sta_key_conf {
        s8 keyidx;
        u8 key[16];
@@ -83,8 +78,8 @@ struct mt7915_sta {
        struct list_head rc_list;
        u32 airtime_ac[8];
 
-       struct mt7915_sta_stats stats;
-
+       unsigned long changed;
+       unsigned long jiffies;
        unsigned long ampdu_state;
 
        struct mt7915_sta_key_conf bip;