gitops/mt76
1
0
Fork 0
mirror of https://github.com/outbackdingo/mt76.git synced 2026-10-24 13:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

wifi: mt76: mt7996: Rely on msta_link link_id in mt7996_vif_link_remove()

Browse Source 
Rely on msta_link link_id value in mt7996_vif_link_remove routine
instead of using link_conf pointer. This assumption is correct since
msta_link link_id is set to link_conf link_id value in mt7996_vif_link_add
routine.
Moreover, fallback to default ieee80211_bss_conf struct if the link_conf
pointer in mt7996_vif_link_remove() is NULL.
MT7996 hw requires to remove AP MLD links from MCU configuration during
AP tear-down process (e.g. running mt7996_remove_interface()). Doing so,
we can't assume link_conf pointer is always non-NULL running
mt7996_vif_link_remove routine.

Signed-off-by: Lorenzo Bianconi <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Lorenzo Bianconi
2026-03-21 08:24:20 +00:00
committed by Felix Fietkau
parent 0c1dedac48
commit 7fa21be01b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mt7996/main.c
+7 -4
View File
@@ -395,17 +395,21 @@ void mt7996_vif_link_remove(struct mt76_phy *mphy, struct ieee80211_vif *vif,
struct mt7996_vif_link *link = container_of(mlink, struct mt7996_vif_link, mt76); struct mt7996_vif_link *link = container_of(mlink, struct mt7996_vif_link, mt76);
struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv; struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;
struct mt7996_sta_link *msta_link = &link->msta_link; struct mt7996_sta_link *msta_link = &link->msta_link;
unsigned int link_id = msta_link->wcid.link_id;
struct mt7996_phy *phy = mphy->priv; struct mt7996_phy *phy = mphy->priv;
struct mt7996_dev *dev = phy->dev; struct mt7996_dev *dev = phy->dev;
struct mt7996_key_iter_data it = { struct mt7996_key_iter_data it = {
.cmd = SET_KEY, .cmd = SET_KEY,
.link_id = link_conf->link_id, .link_id = link_id,
}; };
int idx = msta_link->wcid.idx; int idx = msta_link->wcid.idx;
if (!mlink->wcid->offchannel) if (!mlink->wcid->offchannel)
ieee80211_iter_keys(mphy->hw, vif, mt7996_key_iter, &it); ieee80211_iter_keys(mphy->hw, vif, mt7996_key_iter, &it);
if (!link_conf)
link_conf = &vif->bss_conf;
mt7996_mcu_add_sta(dev, link_conf, NULL, link, NULL, mt7996_mcu_add_sta(dev, link_conf, NULL, link, NULL,
CONN_STATE_DISCONNECT, false); CONN_STATE_DISCONNECT, false);
mt7996_mcu_add_bss_info(phy, vif, link_conf, mlink, msta_link, false); mt7996_mcu_add_bss_info(phy, vif, link_conf, mlink, msta_link, false);
@@ -415,10 +419,9 @@ void mt7996_vif_link_remove(struct mt76_phy *mphy, struct ieee80211_vif *vif,
rcu_assign_pointer(dev->mt76.wcid[idx], NULL); rcu_assign_pointer(dev->mt76.wcid[idx], NULL);
if (vif->txq && !mlink->wcid->offchannel && if (vif->txq && !mlink->wcid->offchannel &&
mvif->mt76.deflink_id == link_conf->link_id) { mvif->mt76.deflink_id == link_id) {
struct ieee80211_bss_conf *iter; struct ieee80211_bss_conf *iter;
struct mt76_txq *mtxq; struct mt76_txq *mtxq;
unsigned int link_id;
mvif->mt76.deflink_id = IEEE80211_LINK_UNSPECIFIED; mvif->mt76.deflink_id = IEEE80211_LINK_UNSPECIFIED;
mtxq = (struct mt76_txq *)vif->txq->drv_priv; mtxq = (struct mt76_txq *)vif->txq->drv_priv;
@@ -426,7 +429,7 @@ void mt7996_vif_link_remove(struct mt76_phy *mphy, struct ieee80211_vif *vif,
for_each_vif_active_link(vif, iter, link_id) { for_each_vif_active_link(vif, iter, link_id) {
struct mt7996_vif_link *link; struct mt7996_vif_link *link;
if (link_id == link_conf->link_id) if (link_id == msta_link->wcid.link_id)
continue; continue;
link = mt7996_vif_link(dev, vif, link_id); link = mt7996_vif_link(dev, vif, link_id);