Commit c1c98696 authored by Sean Wang's avatar Sean Wang Committed by Felix Fietkau
Browse files

wifi: mt76: mt7925: extend mt7925_mcu_bss_basic_tlv for per-link STA 



Extend mt7925_mcu_bss_basic_tlv with the per-link STA configuration.

Co-developed-by: default avatarMing Yen Hsieh <mingyen.hsieh@mediatek.com>
Signed-off-by: default avatarMing Yen Hsieh <mingyen.hsieh@mediatek.com>
Co-developed-by: default avatarDeren Wu <deren.wu@mediatek.com>
Signed-off-by: default avatarDeren Wu <deren.wu@mediatek.com>
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Link: https://patch.msgid.link/20240613030241.5771-42-sean.wang@kernel.org


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

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

+15 −6
Original line number Diff line number Diff line
@@ -2079,19 +2079,17 @@ mt7925_get_phy_mode_ext(struct mt76_phy *phy, struct ieee80211_vif *vif, 
static void

mt7925_mcu_bss_basic_tlv(struct sk_buff *skb,

			 struct ieee80211_bss_conf *link_conf,

			 struct ieee80211_sta *sta,

			 struct ieee80211_link_sta *link_sta,

			 struct ieee80211_chanctx_conf *ctx,

			 struct mt76_phy *phy, u16 wlan_idx,

			 bool enable)

{

	struct ieee80211_vif *vif = link_conf->vif;

	struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf);

	struct mt792x_sta *msta = sta ? (struct mt792x_sta *)sta->drv_priv :

				  &mconf->vif->sta;

	struct ieee80211_link_sta *link_sta = sta ? &sta->deflink : NULL;

	struct cfg80211_chan_def *chandef = ctx ? &ctx->def : &phy->chandef;

	enum nl80211_band band = chandef->chan->band;

	struct mt76_connac_bss_basic_tlv *basic_req;

	struct mt792x_link_sta *mlink;

	struct tlv *tlv;

	int conn_type;

	u8 idx;
@@ -2116,7 +2114,18 @@ mt7925_mcu_bss_basic_tlv(struct sk_buff *skb, 
	basic_req->bcn_interval = cpu_to_le16(link_conf->beacon_int);

	basic_req->dtim_period = link_conf->dtim_period;

	basic_req->bmc_tx_wlan_idx = cpu_to_le16(wlan_idx);

	basic_req->sta_idx = cpu_to_le16(msta->deflink.wcid.idx);



	if (link_sta) {

		struct mt792x_sta *msta;



		msta = (struct mt792x_sta *)link_sta->sta->drv_priv;

		mlink = mt792x_sta_to_link(msta, link_sta->link_id);



	} else {

		mlink = &mconf->vif->sta.deflink;

	}



	basic_req->sta_idx = cpu_to_le16(mlink->wcid.idx);

	basic_req->omac_idx = mconf->mt76.omac_idx;

	basic_req->band_idx = mconf->mt76.band_idx;

	basic_req->wmm_idx = mconf->mt76.wmm_idx;
@@ -2353,7 +2362,7 @@ int mt7925_mcu_add_bss_info(struct mt792x_phy *phy, 
		return PTR_ERR(skb);



	/* bss_basic must be first */

	mt7925_mcu_bss_basic_tlv(skb, link_conf, link_sta->sta, ctx, phy->mt76,

	mt7925_mcu_bss_basic_tlv(skb, link_conf, link_sta, ctx, phy->mt76,

				 mvif->sta.deflink.wcid.idx, enable);

	mt7925_mcu_bss_sec_tlv(skb, link_conf);