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

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

mt76: move beacon_int in mt76_dev 



Move beacon_int in mt76_dev data structure since it is used by
all drivers

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

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

+2 −0
Original line number Diff line number Diff line
@@ -469,6 +469,8 @@ struct mt76_dev { 
	u8 antenna_mask;

	u16 chainmask;



	int beacon_int;



	struct mt76_sband sband_2g;

	struct mt76_sband sband_5g;

	struct debugfs_blob_wrapper eeprom;

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

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ void mt7603_beacon_set_timer(struct mt7603_dev *dev, int idx, int intval) 
		return;

	}



	dev->beacon_int = intval;

	dev->mt76.beacon_int = intval;

	mt76_wr(dev, MT_TBTT,

		FIELD_PREP(MT_TBTT_PERIOD, intval) | MT_TBTT_CAL_ENABLE);

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

+1 −1
Original line number Diff line number Diff line
@@ -1268,7 +1268,7 @@ static void mt7603_dma_sched_reset(struct mt7603_dev *dev) 


static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)

{

	int beacon_int = dev->beacon_int;

	int beacon_int = dev->mt76.beacon_int;

	u32 mask = dev->mt76.mmio.irqmask;

	int i;

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

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ mt7603_sw_scan_complete(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 
	struct mt7603_dev *dev = hw->priv;



	clear_bit(MT76_SCANNING, &dev->mt76.state);

	mt7603_beacon_set_timer(dev, -1, dev->beacon_int);

	mt7603_beacon_set_timer(dev, -1, dev->mt76.beacon_int);

}



static void

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

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


	ktime_t survey_time;

	ktime_t ed_time;

	int beacon_int;



	struct mt76_queue q_rx;