mt76_offchannel_notify_iter(), mt76_rx_beacon_iter() and mt76_beacon_mon_iter() take vif->drv_priv for the link that equals mvif->deflink_id. vif->drv_priv is the link 0 struct, so this is only right while the primary link is link 0. A station MLD whose primary link is link 1 or higher uses the link 0 struct in place of its own: that link sends no PM nullfunc before the radio leaves the channel, and its beacon loss monitor never runs. mt76_vif_init() puts vif->drv_priv into mvif->link[0] for the lifetime of the interface, so take every link from mvif->link[], like mt7996 already does in its TX and RX paths. Fixes: 381733b3a14a ("wifi: mt76: send nullfunc PS frames on offchannel transitions") Fixes: 4df75606ece5 ("wifi: mt76: add per-link beacon monitoring for MLO") Signed-off-by: Felix Fietkau --- drivers/net/wireless/mediatek/mt76/mac80211.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c index 12089dca01b2..5dbedbca838f 100644 --- a/drivers/net/wireless/mediatek/mt76/mac80211.c +++ b/drivers/net/wireless/mediatek/mt76/mac80211.c @@ -2336,10 +2336,7 @@ mt76_offchannel_notify_iter(void *_data, u8 *mac, struct ieee80211_vif *vif) } for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; link_id++) { - if (link_id == mvif->deflink_id) - mlink = (struct mt76_vif_link *)vif->drv_priv; - else - mlink = rcu_dereference(mvif->link[link_id]); + mlink = rcu_dereference(mvif->link[link_id]); if (!mlink) continue; if (mt76_vif_link_phy(mlink) != data->phy) @@ -2389,10 +2386,7 @@ static void mt76_rx_beacon_iter(void *_data, u8 *mac, for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; link_id++) { struct ieee80211_bss_conf *link_conf; - if (link_id == mvif->deflink_id) - mlink = (struct mt76_vif_link *)vif->drv_priv; - else - mlink = rcu_dereference(mvif->link[link_id]); + mlink = rcu_dereference(mvif->link[link_id]); if (!mlink || !READ_ONCE(mlink->beacon_mon_interval)) continue; @@ -2450,10 +2444,7 @@ static void mt76_beacon_mon_iter(void *data, u8 *mac, for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; link_id++) { u16 interval; - if (link_id == mvif->deflink_id) - mlink = (struct mt76_vif_link *)vif->drv_priv; - else - mlink = rcu_dereference(mvif->link[link_id]); + mlink = rcu_dereference(mvif->link[link_id]); if (!mlink) continue; -- 2.47.3