Commit e7173858 authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: add channel switch announcement support 



Use the appropriate mac80211 callbacks after beacon transmission

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 9cf67ec7

drivers/net/wireless/mediatek/mt76/mac80211.c

+39 −0
Original line number Diff line number Diff line
@@ -734,3 +734,42 @@ int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	return 0;

}

EXPORT_SYMBOL_GPL(mt76_get_txpower);



static void

__mt76_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)

{

	if (vif->csa_active && ieee80211_csa_is_complete(vif))

	    ieee80211_csa_finish(vif);

}



void mt76_csa_finish(struct mt76_dev *dev)

{

	if (!dev->csa_complete)

		return;



	ieee80211_iterate_active_interfaces_atomic(dev->hw,

		IEEE80211_IFACE_ITER_RESUME_ALL,

		__mt76_csa_finish, dev);



	dev->csa_complete = 0;

}

EXPORT_SYMBOL_GPL(mt76_csa_finish);



static void

__mt76_csa_check(void *priv, u8 *mac, struct ieee80211_vif *vif)

{

	struct mt76_dev *dev = priv;



	if (!vif->csa_active)

		return;



	dev->csa_complete |= ieee80211_csa_is_complete(vif);

}



void mt76_csa_check(struct mt76_dev *dev)

{

	ieee80211_iterate_active_interfaces_atomic(dev->hw,

		IEEE80211_IFACE_ITER_RESUME_ALL,

		__mt76_csa_check, dev);

}

EXPORT_SYMBOL_GPL(mt76_csa_check);

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

+5 −0
Original line number Diff line number Diff line
@@ -463,6 +463,8 @@ struct mt76_dev { 
	bool led_al;

	u8 led_pin;



	u8 csa_complete;



	u32 rxfilter;



	union {
@@ -691,6 +693,9 @@ int mt76_get_min_avg_rssi(struct mt76_dev *dev); 
int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		     int *dbm);



void mt76_csa_check(struct mt76_dev *dev);

void mt76_csa_finish(struct mt76_dev *dev);



/* internal */

void mt76_tx_free(struct mt76_dev *dev);

struct mt76_txwi_cache *mt76_get_txwi(struct mt76_dev *dev);

drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c

+11 −2
Original line number Diff line number Diff line
@@ -116,6 +116,11 @@ static void mt76x02_pre_tbtt_tasklet(unsigned long arg) 
		IEEE80211_IFACE_ITER_RESUME_ALL,

		mt76x02_update_beacon_iter, dev);



	mt76_csa_check(&dev->mt76);



	if (dev->mt76.csa_complete)

		return;



	do {

		nframes = skb_queue_len(&data.q);

		ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),
@@ -309,8 +314,12 @@ irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance) 
		tasklet_schedule(&dev->pre_tbtt_tasklet);



	/* send buffered multicast frames now */

	if (intr & MT_INT_TBTT)

	if (intr & MT_INT_TBTT) {

		if (dev->mt76.csa_complete)

			mt76_csa_finish(&dev->mt76);

		else

			mt76_queue_kick(dev, &dev->mt76.q_tx[MT_TXQ_PSD]);

	}



	if (intr & MT_INT_TX_STAT) {

		mt76x02_mac_poll_tx_status(dev, true);

drivers/net/wireless/mediatek/mt76/mt76x02_util.c

+2 −0
Original line number Diff line number Diff line
@@ -160,6 +160,8 @@ void mt76x02_init_device(struct mt76x02_dev *dev) 
#endif

			BIT(NL80211_IFTYPE_ADHOC);



		wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;



		wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_VHT_IBSS);



		/* init led callbacks */