Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-22 19:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

mt76: mt7603: move survey_time in mt76_dev

Browse Source 
Move survey_time field in mt76_dev in order to be reused adding survey
support to mt7615 driver

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Lorenzo Bianconi 2019-08-05 08:55:52 +02:00 committed by Felix Fietkau
parent 168aea24f4
commit fc98e670ad
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/mediatek/mt76/mt76.h
View File

@ -490,6 +490,8 @@ struct mt76_dev {
u8 csa_complete;
ktime_t survey_time;
u32 rxfilter;
union {

5
drivers/net/wireless/mediatek/mt76/mt7603/mac.c
View File

@ -1473,8 +1473,9 @@ void mt7603_update_channel(struct mt76_dev *mdev)
spin_lock_bh(&dev->mt76.cc_lock);
cur_time = ktime_get_boottime();
state->cc_busy += busy;
state->cc_active += ktime_to_us(ktime_sub(cur_time, dev->survey_time));
dev->survey_time = cur_time;
state->cc_active += ktime_to_us(ktime_sub(cur_time,
dev->mt76.survey_time));
dev->mt76.survey_time = cur_time;
spin_unlock_bh(&dev->mt76.cc_lock);
}

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

@ -14,7 +14,7 @@ mt7603_start(struct ieee80211_hw *hw)
struct mt7603_dev *dev = hw->priv;
mt7603_mac_start(dev);
dev->survey_time = ktime_get_boottime();
dev->mt76.survey_time = ktime_get_boottime();
set_bit(MT76_STATE_RUNNING, &dev->mt76.state);
mt7603_mac_work(&dev->mt76.mac_work.work);
@ -182,7 +182,7 @@ mt7603_set_channel(struct mt7603_dev *dev, struct cfg80211_chan_def *def)
mt76_rr(dev, MT_MIB_STAT_PSCCA);
mt7603_cca_stats_reset(dev);
dev->survey_time = ktime_get_boottime();
dev->mt76.survey_time = ktime_get_boottime();
mt7603_init_edcca(dev);

1
drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
View File

@ -116,7 +116,6 @@ struct mt7603_dev {
s8 tx_power_limit;
ktime_t survey_time;
ktime_t ed_time;
struct mt76_queue q_rx;