wifi: mt76: mt7925: add link handling in mt7925_vif_connect_iter

add link handling in mt7925_vif_connect_iter

Co-developed-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Co-developed-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Link: https://patch.msgid.link/c8d66043a4d31801249d53dd23f695c28a97a933.1720248331.git.sean.wang@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mac.c b/drivers/net/wireless/mediatek/mt76/mt7925/mac.c
index 0cb9031e9fdd25e8280d477e9a6d2797e323e44c..cf36750cf70923bb5d76787050994217c759a430 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mac.c
@@ -1267,15 +1267,23 @@ mt7925_vif_connect_iter(void *priv, u8 *mac,
                        struct ieee80211_vif *vif)
 {
        struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
+       unsigned long valid = ieee80211_vif_is_mld(vif) ?
+                             mvif->valid_links : BIT(0);
        struct mt792x_dev *dev = mvif->phy->dev;
        struct ieee80211_hw *hw = mt76_hw(dev);
+       struct ieee80211_bss_conf *bss_conf;
+       int i;
 
        if (vif->type == NL80211_IFTYPE_STATION)
                ieee80211_disconnect(vif, true);
 
-       mt76_connac_mcu_uni_add_dev(&dev->mphy, &vif->bss_conf,
-                                   &mvif->sta.deflink.wcid, true);
-       mt7925_mcu_set_tx(dev, &vif->bss_conf);
+       for_each_set_bit(i, &valid, IEEE80211_MLD_MAX_NUM_LINKS) {
+               bss_conf = mt792x_vif_to_bss_conf(vif, i);
+
+               mt76_connac_mcu_uni_add_dev(&dev->mphy, bss_conf,
+                                           &mvif->sta.deflink.wcid, true);
+               mt7925_mcu_set_tx(dev, bss_conf);
+       }
 
        if (vif->type == NL80211_IFTYPE_AP) {
                mt76_connac_mcu_uni_add_bss(dev->phy.mt76, vif, &mvif->sta.deflink.wcid,