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

mt76: mt7996: rely on mt76_sta_stats in mt76_wcid 



mt76 now accounts station stats in mt76_sta_stats available in mt76_wcid
struct. Get rid of mt7996 private copy.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent c4f07558

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

+4 −3
Original line number Diff line number Diff line
@@ -1329,9 +1329,10 @@ mt7996_mac_tx_free(struct mt7996_dev *dev, void *data, int len) 
}



static bool

mt7996_mac_add_txs_skb(struct mt7996_dev *dev, struct mt76_wcid *wcid, int pid,

		       __le32 *txs_data, struct mt76_sta_stats *stats)

mt7996_mac_add_txs_skb(struct mt7996_dev *dev, struct mt76_wcid *wcid,

		       int pid, __le32 *txs_data)

{

	struct mt76_sta_stats *stats = &wcid->stats;

	struct ieee80211_supported_band *sband;

	struct mt76_dev *mdev = &dev->mt76;

	struct mt76_phy *mphy;
@@ -1493,7 +1494,7 @@ static void mt7996_mac_add_txs(struct mt7996_dev *dev, void *data) 


	msta = container_of(wcid, struct mt7996_sta, wcid);



	mt7996_mac_add_txs_skb(dev, wcid, pid, txs_data, &msta->stats);

	mt7996_mac_add_txs_skb(dev, wcid, pid, txs_data);



	if (!wcid->sta)

		goto out;

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

+1 −1
Original line number Diff line number Diff line
@@ -1214,7 +1214,7 @@ static void mt7996_ethtool_worker(void *wi_data, struct ieee80211_sta *sta) 
	if (msta->vif->mt76.idx != wi->idx)

		return;



	mt76_ethtool_worker(wi, &msta->stats, true);

	mt76_ethtool_worker(wi, &msta->wcid.stats, true);

}



static

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

+0 −2
Original line number Diff line number Diff line
@@ -106,8 +106,6 @@ struct mt7996_sta { 
	unsigned long jiffies;

	unsigned long ampdu_state;



	struct mt76_sta_stats stats;



	struct mt76_connac_sta_key_conf bip;



	struct {