Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

mt76: mt7603: move survey_time in mt76_dev 



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

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

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

+2 −0
Original line number Diff line number Diff line
@@ -490,6 +490,8 @@ struct mt76_dev { 


	u8 csa_complete;



	ktime_t survey_time;



	u32 rxfilter;



	union {

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

+3 −2
Original line number Diff line number Diff line
@@ -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);

}

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

+2 −2
Original line number Diff line number Diff line
@@ -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);

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

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ struct mt7603_dev { 


	s8 tx_power_limit;



	ktime_t survey_time;

	ktime_t ed_time;



	struct mt76_queue q_rx;