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

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

mt76: move pre_tbtt_tasklet in mt76_dev 



Move pre_tbtt_tasklet tasklet 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 f1103fa6

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

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

	u16 chainmask;



	struct tasklet_struct pre_tbtt_tasklet;

	int beacon_int;

	u8 beacon_mask;

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

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ irqreturn_t mt7603_irq_handler(int irq, void *dev_instance) 


		mt76_wr(dev, MT_HW_INT_STATUS(3), hwintr);

		if (hwintr & MT_HW_INT3_PRE_TBTT0)

			tasklet_schedule(&dev->pre_tbtt_tasklet);

			tasklet_schedule(&dev->mt76.pre_tbtt_tasklet);



		if ((hwintr & MT_HW_INT3_TBTT0) && dev->mt76.csa_complete)

			mt76_csa_finish(&dev->mt76);

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

+2 −2
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ int mt7603_register_device(struct mt7603_dev *dev) 
	spin_lock_init(&dev->ps_lock);



	INIT_DELAYED_WORK(&dev->mt76.mac_work, mt7603_mac_work);

	tasklet_init(&dev->pre_tbtt_tasklet, mt7603_pre_tbtt_tasklet,

	tasklet_init(&dev->mt76.pre_tbtt_tasklet, mt7603_pre_tbtt_tasklet,

		     (unsigned long)dev);



	/* Check for 7688, which only has 1SS */
@@ -574,7 +574,7 @@ int mt7603_register_device(struct mt7603_dev *dev) 


void mt7603_unregister_device(struct mt7603_dev *dev)

{

	tasklet_disable(&dev->pre_tbtt_tasklet);

	tasklet_disable(&dev->mt76.pre_tbtt_tasklet);

	mt76_unregister_device(&dev->mt76);

	mt7603_mcu_exit(dev);

	mt7603_dma_cleanup(dev);

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

+2 −2
Original line number Diff line number Diff line
@@ -1279,7 +1279,7 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev) 
	mt76_txq_schedule_all(&dev->mt76);



	tasklet_disable(&dev->mt76.tx_tasklet);

	tasklet_disable(&dev->pre_tbtt_tasklet);

	tasklet_disable(&dev->mt76.pre_tbtt_tasklet);

	napi_disable(&dev->mt76.napi[0]);

	napi_disable(&dev->mt76.napi[1]);
@@ -1328,7 +1328,7 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev) 
	tasklet_enable(&dev->mt76.tx_tasklet);

	tasklet_schedule(&dev->mt76.tx_tasklet);



	tasklet_enable(&dev->pre_tbtt_tasklet);

	tasklet_enable(&dev->mt76.pre_tbtt_tasklet);

	mt7603_beacon_set_timer(dev, -1, beacon_int);



	napi_enable(&dev->mt76.napi[0]);

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

+2 −2
Original line number Diff line number Diff line
@@ -294,9 +294,9 @@ mt7603_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	if (changed & (BSS_CHANGED_BEACON_ENABLED | BSS_CHANGED_BEACON_INT)) {

		int beacon_int = !!info->enable_beacon * info->beacon_int;



		tasklet_disable(&dev->pre_tbtt_tasklet);

		tasklet_disable(&dev->mt76.pre_tbtt_tasklet);

		mt7603_beacon_set_timer(dev, mvif->idx, beacon_int);

		tasklet_enable(&dev->pre_tbtt_tasklet);

		tasklet_enable(&dev->mt76.pre_tbtt_tasklet);

	}



	mutex_unlock(&dev->mt76.mutex);