NACK/Cmnt: [SRU][Q/P/N:hwe-6.14][PATCH 1/1] wifi: mt76: mt7925: add MBSSID

[Jacob Martin]

On 10/6/25 3:55 PM, Mitchell Augustin wrote:
> From: Ming Yen Hsieh <mingyen.hsieh at mediatek.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/2119479
> 
> Enable MBSSID support for MT7925 by setting the
> appropriate capability to the firmware.
> 
> Signed-off-by: Ming Yen Hsieh <mingyen.hsieh at mediatek.com>
> Link: https://patch.msgid.link/20250729084932.264155-1-mingyen.hsieh@mediatek.com
> Signed-off-by: Felix Fietkau <nbd at nbd.name>
> (cherry picked from commit 74e756b9e28af3ee94a7ea480bb39694be5fbd96)
> Signed-off-by: Mitchell Augustin <mitchell.augustin at canonical.com>
> ---
>   .../net/wireless/mediatek/mt76/mt7925/main.c  |  1 +
>   .../net/wireless/mediatek/mt76/mt7925/mcu.c   | 23 ++++++++++++++++++-
>   .../net/wireless/mediatek/mt76/mt792x_core.c  |  7 +++++-
>   3 files changed, 29 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
> index 61080d8b4b46..c5daeb6fd305 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
> @@ -240,6 +240,7 @@ int mt7925_init_mlo_caps(struct mt792x_phy *phy)
>   {
>   	struct wiphy *wiphy = phy->mt76->hw->wiphy;
>   	static const u8 ext_capa_sta[] = {
> +		[2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT,
>   		[7] = WLAN_EXT_CAPA8_OPMODE_NOTIF,
>   	};
>   	static struct wiphy_iftype_ext_capab ext_capab[] = {
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
> index de1cd33d0c49..1ea2ba368cc0 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
> @@ -2578,6 +2578,25 @@ mt7925_mcu_bss_qos_tlv(struct sk_buff *skb, struct ieee80211_bss_conf *link_conf
>   	qos->qos = link_conf->qos;
>   }
>   
> +static void
> +mt7925_mcu_bss_mbssid_tlv(struct sk_buff *skb, struct ieee80211_bss_conf *link_conf,
> +			  bool enable)
> +{
> +	struct bss_info_uni_mbssid *mbssid;
> +	struct tlv *tlv;
> +
> +	if (!enable && !link_conf->bssid_indicator)
> +		return;
> +
> +	tlv = mt76_connac_mcu_add_tlv(skb, UNI_BSS_INFO_11V_MBSSID,
> +				      sizeof(*mbssid));
> +
> +	mbssid = (struct bss_info_uni_mbssid *)tlv;
> +	mbssid->max_indicator = link_conf->bssid_indicator;
> +	mbssid->mbss_idx = link_conf->bssid_index;
> +	mbssid->tx_bss_omac_idx = 0;
> +}
> +
>   static void
>   mt7925_mcu_bss_he_tlv(struct sk_buff *skb, struct ieee80211_bss_conf *link_conf,
>   		      struct mt792x_phy *phy)
> @@ -2744,8 +2763,10 @@ int mt7925_mcu_add_bss_info(struct mt792x_phy *phy,
>   		mt7925_mcu_bss_color_tlv(skb, link_conf, enable);
>   	}
>   
> -	if (enable)
> +	if (enable) {
>   		mt7925_mcu_bss_rlm_tlv(skb, phy->mt76, link_conf, ctx);
> +		mt7925_mcu_bss_mbssid_tlv(skb, link_conf, enable);
> +	}
>   
>   	return mt76_mcu_skb_send_msg(&dev->mt76, skb,
>   				     MCU_UNI_CMD(BSS_INFO_UPDATE), true);
> diff --git a/drivers/net/wireless/mediatek/mt76/mt792x_core.c b/drivers/net/wireless/mediatek/mt76/mt792x_core.c
> index 0f7806f6338d..900f2878e8e7 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt792x_core.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt792x_core.c
> @@ -665,8 +665,13 @@ int mt792x_init_wiphy(struct ieee80211_hw *hw)
>   	ieee80211_hw_set(hw, SUPPORTS_DYNAMIC_PS);
>   	ieee80211_hw_set(hw, SUPPORTS_VHT_EXT_NSS_BW);
>   	ieee80211_hw_set(hw, CONNECTION_MONITOR);

This patch fails to apply to Questing because the following commit in 
6.17 introduces a line here that conflicts with the MBSSID patch: 
55e95ce469d0 ("wifi: mt76: mt792x: improve monitor interface handling"). 
Questing will need its own version of the patch.

Additionally the subject of the upstream commit "wifi: mt76: mt7925: add 
MBSSID support" doesn't match the subject provided in this version of 
the patch "wifi: mt76: mt7925: add MBSSID". It looks like it was 
truncated somehow?

Jacob

> -	if (is_mt7921(&dev->mt76))
> +
> +	if (is_mt7921(&dev->mt76)) {
>   		ieee80211_hw_set(hw, CHANCTX_STA_CSA);
> +	} else {
> +		ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID);
> +		ieee80211_hw_set(hw, SUPPORTS_ONLY_HE_MULTI_BSSID);
> +	}
>   
>   	if (dev->pm.enable)
>   		ieee80211_hw_set(hw, CONNECTION_MONITOR);