iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mt76: mt7915: remove mt7915_sta_stats

Browse Source 
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>
This commit is contained in:
Ryder Lee
2021-07-14 17:18:51 +08:00
committed by Felix Fietkau
parent 9908d98ae7
commit 05909e4625
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/mediatek/mt76/mt7915/mac.c
View File

@ -1100,9 +1100,9 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
msta = (struct mt7915_sta *)sta->drv_priv; 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; 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)) { while (!list_empty(&list)) {
msta = list_first_entry(&list, struct mt7915_sta, rc_list); msta = list_first_entry(&list, struct mt7915_sta, rc_list);
list_del_init(&msta->rc_list); list_del_init(&msta->rc_list);
changed = msta->stats.changed; changed = msta->changed;
msta->stats.changed = 0; msta->changed = 0;
spin_unlock_bh(&dev->sta_poll_lock); spin_unlock_bh(&dev->sta_poll_lock);
sta = container_of((void *)msta, struct ieee80211_sta, drv_priv); sta = container_of((void *)msta, struct ieee80211_sta, drv_priv);

4
drivers/net/wireless/mediatek/mt76/mt7915/main.c
View File

@ -623,7 +623,7 @@ int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
msta->wcid.idx = idx; msta->wcid.idx = idx;
msta->wcid.ext_phy = mvif->band_idx; msta->wcid.ext_phy = mvif->band_idx;
msta->wcid.tx_info |= MT_WCID_TX_INFO_SET; msta->wcid.tx_info |= MT_WCID_TX_INFO_SET;
msta->stats.jiffies = jiffies; msta->jiffies = jiffies;
mt7915_mac_wtbl_update(dev, idx, mt7915_mac_wtbl_update(dev, idx,
MT_WTBL_UPDATE_ADM_COUNT_CLEAR); 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; u32 *changed = data;
spin_lock_bh(&dev->sta_poll_lock); spin_lock_bh(&dev->sta_poll_lock);
msta->stats.changed |= *changed; msta->changed |= *changed;
if (list_empty(&msta->rc_list)) if (list_empty(&msta->rc_list))
list_add_tail(&msta->rc_list, &dev->sta_rc_list); list_add_tail(&msta->rc_list, &dev->sta_rc_list);
spin_unlock_bh(&dev->sta_poll_lock); spin_unlock_bh(&dev->sta_poll_lock);

9
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
View File

@ -64,11 +64,6 @@ enum mt7915_rxq_id {
MT7915_RXQ_MCU_WA_EXT, MT7915_RXQ_MCU_WA_EXT,
}; };
struct mt7915_sta_stats {
unsigned long changed;
unsigned long jiffies;
};
struct mt7915_sta_key_conf { struct mt7915_sta_key_conf {
s8 keyidx; s8 keyidx;
u8 key[16]; u8 key[16];
@ -83,8 +78,8 @@ struct mt7915_sta {
struct list_head rc_list; struct list_head rc_list;
u32 airtime_ac[8]; u32 airtime_ac[8];
struct mt7915_sta_stats stats; unsigned long changed;
unsigned long jiffies;
unsigned long ampdu_state; unsigned long ampdu_state;
struct mt7915_sta_key_conf bip; struct mt7915_sta_key_conf bip;