Commit 1b9ba30e authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau

wifi: mt76: mt7615: rely on mt7615_phy in mt7615_mac_reset_counters

This is a preliminary patch to move aggr_stats array in mt76_phy
structure.
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 028b4f22
...@@ -107,9 +107,9 @@ static struct mt76_wcid *mt7615_rx_get_wcid(struct mt7615_dev *dev, ...@@ -107,9 +107,9 @@ static struct mt76_wcid *mt7615_rx_get_wcid(struct mt7615_dev *dev,
return &sta->vif->sta.wcid; return &sta->vif->sta.wcid;
} }
void mt7615_mac_reset_counters(struct mt7615_dev *dev) void mt7615_mac_reset_counters(struct mt7615_phy *phy)
{ {
struct mt76_phy *mphy_ext = dev->mt76.phys[MT_BAND1]; struct mt7615_dev *dev = phy->dev;
int i; int i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
...@@ -118,9 +118,7 @@ void mt7615_mac_reset_counters(struct mt7615_dev *dev) ...@@ -118,9 +118,7 @@ void mt7615_mac_reset_counters(struct mt7615_dev *dev)
} }
memset(dev->mt76.aggr_stats, 0, sizeof(dev->mt76.aggr_stats)); memset(dev->mt76.aggr_stats, 0, sizeof(dev->mt76.aggr_stats));
dev->mt76.phy.survey_time = ktime_get_boottime(); phy->mt76->survey_time = ktime_get_boottime();
if (mphy_ext)
mphy_ext->survey_time = ktime_get_boottime();
/* reset airtime counters */ /* reset airtime counters */
mt76_rr(dev, MT_MIB_SDR9(0)); mt76_rr(dev, MT_MIB_SDR9(0));
......
...@@ -83,7 +83,7 @@ static int mt7615_start(struct ieee80211_hw *hw) ...@@ -83,7 +83,7 @@ static int mt7615_start(struct ieee80211_hw *hw)
ieee80211_queue_delayed_work(hw, &phy->mt76->mac_work, timeout); ieee80211_queue_delayed_work(hw, &phy->mt76->mac_work, timeout);
if (!running) if (!running)
mt7615_mac_reset_counters(dev); mt7615_mac_reset_counters(phy);
out: out:
mt7615_mutex_release(dev); mt7615_mutex_release(dev);
...@@ -320,7 +320,7 @@ int mt7615_set_channel(struct mt7615_phy *phy) ...@@ -320,7 +320,7 @@ int mt7615_set_channel(struct mt7615_phy *phy)
if (ret) if (ret)
goto out; goto out;
mt7615_mac_reset_counters(dev); mt7615_mac_reset_counters(phy);
phy->noise = 0; phy->noise = 0;
phy->chfreq = mt76_rr(dev, MT_CHFREQ(ext_phy)); phy->chfreq = mt76_rr(dev, MT_CHFREQ(ext_phy));
......
...@@ -469,7 +469,7 @@ void mt7615_init_work(struct mt7615_dev *dev); ...@@ -469,7 +469,7 @@ void mt7615_init_work(struct mt7615_dev *dev);
int mt7615_mcu_restart(struct mt76_dev *dev); int mt7615_mcu_restart(struct mt76_dev *dev);
void mt7615_update_channel(struct mt76_phy *mphy); void mt7615_update_channel(struct mt76_phy *mphy);
bool mt7615_mac_wtbl_update(struct mt7615_dev *dev, int idx, u32 mask); bool mt7615_mac_wtbl_update(struct mt7615_dev *dev, int idx, u32 mask);
void mt7615_mac_reset_counters(struct mt7615_dev *dev); void mt7615_mac_reset_counters(struct mt7615_phy *phy);
void mt7615_mac_cca_stats_reset(struct mt7615_phy *phy); void mt7615_mac_cca_stats_reset(struct mt7615_phy *phy);
void mt7615_mac_set_scs(struct mt7615_phy *phy, bool enable); void mt7615_mac_set_scs(struct mt7615_phy *phy, bool enable);
void mt7615_mac_enable_nf(struct mt7615_dev *dev, bool ext_phy); void mt7615_mac_enable_nf(struct mt7615_dev *dev, bool ext_phy);
......
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