Commit 57ccb37a authored by Michael-CY Lee's avatar Michael-CY Lee Committed by Felix Fietkau
Browse files

wifi: mt76: mt7996: fix beacon command during disabling 



When stopping AP, mac80211 frees beacon template before it calls
driver's stop_ap operation. In other words, on the path of stopping
AP, ieee80211_beacon_get_template() must returns NULL in
mt7996_mcu_add_beacon(). In such case mt7996 immediately returns
-EINVAL without telling FW to disable the beacon.

This commit refactors mt7996_mcu_add_beacon() so that FW can be
correctly informed when disabling AP interface.

Co-developed-by: default avatarShayne Chen <shayne.chen@mediatek.com>
Signed-off-by: default avatarShayne Chen <shayne.chen@mediatek.com>
Signed-off-by: default avatarMichael-CY Lee <michael-cy.lee@mediatek.com>
Link: https://patch.msgid.link/20250114101026.3587702-8-shayne.chen@mediatek.com


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

drivers/net/wireless/mediatek/mt76/mt7996/mcu.c

+15 −11
Original line number Diff line number Diff line
@@ -2520,7 +2520,7 @@ int mt7996_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	struct sk_buff *skb, *rskb;

	struct tlv *tlv;

	struct bss_bcn_content_tlv *bcn;

	int len;

	int len, extra_len = 0;



	if (link_conf->nontransmitted)

		return 0;
@@ -2534,11 +2534,12 @@ int mt7996_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		return PTR_ERR(rskb);



	skb = ieee80211_beacon_get_template(hw, vif, &offs, link_conf->link_id);

	if (!skb) {

	if (link_conf->enable_beacon && !skb) {

		dev_kfree_skb(rskb);

		return -EINVAL;

	}



	if (skb) {

		if (skb->len > MT7996_MAX_BEACON_SIZE) {

			dev_err(dev->mt76.dev, "Bcn size limit exceed\n");

			dev_kfree_skb(rskb);
@@ -2546,16 +2547,19 @@ int mt7996_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
			return -EINVAL;

		}



	info = IEEE80211_SKB_CB(skb);

	info->hw_queue |= FIELD_PREP(MT_TX_HW_QUEUE_PHY, mlink->band_idx);

		extra_len = skb->len;

	}



	len = ALIGN(sizeof(*bcn) + MT_TXD_SIZE + skb->len, 4);

	len = ALIGN(sizeof(*bcn) + MT_TXD_SIZE + extra_len, 4);

	tlv = mt7996_mcu_add_uni_tlv(rskb, UNI_BSS_INFO_BCN_CONTENT, len);

	bcn = (struct bss_bcn_content_tlv *)tlv;

	bcn->enable = link_conf->enable_beacon;

	if (!bcn->enable)

		goto out;



	info = IEEE80211_SKB_CB(skb);

	info->hw_queue |= FIELD_PREP(MT_TX_HW_QUEUE_PHY, mlink->band_idx);



	mt7996_mcu_beacon_cont(dev, link_conf, rskb, skb, bcn, &offs);

	if (link_conf->bssid_indicator)

		mt7996_mcu_beacon_mbss(rskb, skb, bcn, &offs);