Commit c92fc81b authored by Shayne Chen's avatar Shayne Chen Committed by Felix Fietkau
Browse files

wifi: mt76: mt7996: rework mt7996_mcu_beacon_inband_discov to support MLO 



Rework mt7996_mcu_beacon_inband_discov routine in order to support
multi-link setup.

Co-developed-by: default avatarBo Jiao <Bo.Jiao@mediatek.com>
Signed-off-by: default avatarBo Jiao <Bo.Jiao@mediatek.com>
Co-developed-by: default avatarPeter Chiu <chui-hao.chiu@mediatek.com>
Signed-off-by: default avatarPeter Chiu <chui-hao.chiu@mediatek.com>
Signed-off-by: default avatarShayne Chen <shayne.chen@mediatek.com>
Co-developed-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20250312-b4-mt7996-mlo-p2-v1-17-015b3d6fd928@kernel.org


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

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

+1 −1
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ mt7996_link_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 


	if (changed & (BSS_CHANGED_UNSOL_BCAST_PROBE_RESP |

		       BSS_CHANGED_FILS_DISCOVERY))

		mt7996_mcu_beacon_inband_discov(dev, vif, changed);

		mt7996_mcu_beacon_inband_discov(dev, info, link, changed);



	if (changed & BSS_CHANGED_MU_GROUPS)

		mt7996_update_mu_group(hw, link, info);

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

+10 −9
Original line number Diff line number Diff line
@@ -2717,13 +2717,14 @@ int mt7996_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
}



int mt7996_mcu_beacon_inband_discov(struct mt7996_dev *dev,

				    struct ieee80211_vif *vif, u32 changed)

				    struct ieee80211_bss_conf *link_conf,

				    struct mt7996_vif_link *link, u32 changed)

{

#define OFFLOAD_TX_MODE_SU	BIT(0)

#define OFFLOAD_TX_MODE_MU	BIT(1)

	struct ieee80211_vif *vif = link_conf->vif;

	struct ieee80211_hw *hw = mt76_hw(dev);

	struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;

	struct mt7996_phy *phy = mt7996_vif_link_phy(&mvif->deflink);

	struct mt7996_phy *phy = link->phy;

	struct mt76_wcid *wcid = &dev->mt76.global_wcid;

	struct bss_inband_discovery_tlv *discov;

	struct ieee80211_tx_info *info;
@@ -2740,21 +2741,21 @@ int mt7996_mcu_beacon_inband_discov(struct mt7996_dev *dev, 
	chandef = &phy->mt76->chandef;

	band = chandef->chan->band;



	if (vif->bss_conf.nontransmitted)

	if (link_conf->nontransmitted)

		return 0;



	rskb = __mt7996_mcu_alloc_bss_req(&dev->mt76, &mvif->deflink.mt76,

	rskb = __mt7996_mcu_alloc_bss_req(&dev->mt76, &link->mt76,

					  MT7996_MAX_BSS_OFFLOAD_SIZE);

	if (IS_ERR(rskb))

		return PTR_ERR(rskb);



	if (changed & BSS_CHANGED_FILS_DISCOVERY &&

	    vif->bss_conf.fils_discovery.max_interval) {

		interval = vif->bss_conf.fils_discovery.max_interval;

	    link_conf->fils_discovery.max_interval) {

		interval = link_conf->fils_discovery.max_interval;

		skb = ieee80211_get_fils_discovery_tmpl(hw, vif);

	} else if (changed & BSS_CHANGED_UNSOL_BCAST_PROBE_RESP &&

		   vif->bss_conf.unsol_bcast_probe_resp_interval) {

		interval = vif->bss_conf.unsol_bcast_probe_resp_interval;

		   link_conf->unsol_bcast_probe_resp_interval) {

		interval = link_conf->unsol_bcast_probe_resp_interval;

		skb = ieee80211_get_unsol_bcast_probe_resp_tmpl(hw, vif);

	}

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

+2 −1
Original line number Diff line number Diff line
@@ -594,7 +594,8 @@ int mt7996_mcu_update_bss_color(struct mt7996_dev *dev, 
int mt7996_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

			  struct ieee80211_bss_conf *link_conf);

int mt7996_mcu_beacon_inband_discov(struct mt7996_dev *dev,

				    struct ieee80211_vif *vif, u32 changed);

				    struct ieee80211_bss_conf *link_conf,

				    struct mt7996_vif_link *link, u32 changed);

int mt7996_mcu_add_obss_spr(struct mt7996_phy *phy,

			    struct mt7996_vif_link *link,

			    struct ieee80211_he_obss_pd *he_obss_pd);