wifi: mt76: fix vif link allocation

[ Upstream commit 53a5d72bdd70e262623b6009cc4754927b428bad ]

Reuse the vif deflink for link_id = 0 in order to avoid confusion with
vif->bss_conf, which also gets a link id of 0.

Link: https://patch.msgid.link/20250704-mt7996-mlo-fixes-v1-1-356456c73f43@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/channel.c b/drivers/net/wireless/mediatek/mt76/channel.c
index cc2d888e3f17a58512e6282686b446109ec7ab3c..77b75792eb488e9c5da9ca8026c04157182c13a4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/channel.c
+++ b/drivers/net/wireless/mediatek/mt76/channel.c
@@ -173,13 +173,13 @@ void mt76_unassign_vif_chanctx(struct ieee80211_hw *hw,
        if (!mlink)
                goto out;
 
-       if (link_conf != &vif->bss_conf)
+       if (mlink != (struct mt76_vif_link *)vif->drv_priv)
                rcu_assign_pointer(mvif->link[link_id], NULL);
 
        dev->drv->vif_link_remove(phy, vif, link_conf, mlink);
        mlink->ctx = NULL;
 
-       if (link_conf != &vif->bss_conf)
+       if (mlink != (struct mt76_vif_link *)vif->drv_priv)
                kfree_rcu(mlink, rcu_head);
 
 out:

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 74b75035d3614852b7666f6eafba72b0074d56bf..0ecf77fcbe3d07ade874e95f1c03afbd4ff986b2 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -1874,6 +1874,9 @@ mt76_vif_link(struct mt76_dev *dev, struct ieee80211_vif *vif, int link_id)
        struct mt76_vif_link *mlink = (struct mt76_vif_link *)vif->drv_priv;
        struct mt76_vif_data *mvif = mlink->mvif;
 
+       if (!link_id)
+               return mlink;
+
        return mt76_dereference(mvif->link[link_id], dev);
 }
 
@@ -1884,7 +1887,7 @@ mt76_vif_conf_link(struct mt76_dev *dev, struct ieee80211_vif *vif,
        struct mt76_vif_link *mlink = (struct mt76_vif_link *)vif->drv_priv;
        struct mt76_vif_data *mvif = mlink->mvif;
 
-       if (link_conf == &vif->bss_conf)
+       if (link_conf == &vif->bss_conf || !link_conf->link_id)
                return mlink;
 
        return mt76_dereference(mvif->link[link_conf->link_id], dev);