Skip to content

Commit 46f0648

Browse files
LorenzoBianconigregkh
authored andcommitted
wifi: mt76: mt7996: grab mt76 mutex in mt7996_mac_sta_event()
[ Upstream commit 5a4bcba ] Grab mt76 mutex in mt7996_mac_sta_event routine in order to rely on mt76_dereference() utility macro. Fixes: ecd72f9 ("wifi: mt76: mt7996: Support MLO in mt7996_mac_sta_event()") Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Tested-by: Ben Greear <greearb@candelatech.com> Link: https://patch.msgid.link/20251114-mt76-fix-missing-mtx-v1-1-259ebf11f654@kernel.org Signed-off-by: Felix Fietkau <nbd@nbd.name> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent b4b789d commit 46f0648

File tree

1 file changed

+10
-5
lines changed
  • drivers/net/wireless/mediatek/mt76/mt7996

1 file changed

+10
-5
lines changed

drivers/net/wireless/mediatek/mt76/mt7996/main.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,12 +1150,15 @@ mt7996_mac_sta_event(struct mt7996_dev *dev, struct ieee80211_vif *vif,
11501150
unsigned long links = sta->valid_links;
11511151
struct ieee80211_link_sta *link_sta;
11521152
unsigned int link_id;
1153+
int err = 0;
1154+
1155+
mutex_lock(&dev->mt76.mutex);
11531156

11541157
for_each_sta_active_link(vif, sta, link_sta, link_id) {
11551158
struct ieee80211_bss_conf *link_conf;
11561159
struct mt7996_sta_link *msta_link;
11571160
struct mt7996_vif_link *link;
1158-
int i, err;
1161+
int i;
11591162

11601163
link_conf = link_conf_dereference_protected(vif, link_id);
11611164
if (!link_conf)
@@ -1175,12 +1178,12 @@ mt7996_mac_sta_event(struct mt7996_dev *dev, struct ieee80211_vif *vif,
11751178
link, msta_link,
11761179
CONN_STATE_CONNECT, true);
11771180
if (err)
1178-
return err;
1181+
goto unlock;
11791182

11801183
err = mt7996_mcu_add_rate_ctrl(dev, msta_link->sta, vif,
11811184
link_id, false);
11821185
if (err)
1183-
return err;
1186+
goto unlock;
11841187

11851188
msta_link->wcid.tx_info |= MT_WCID_TX_INFO_SET;
11861189
break;
@@ -1189,7 +1192,7 @@ mt7996_mac_sta_event(struct mt7996_dev *dev, struct ieee80211_vif *vif,
11891192
link, msta_link,
11901193
CONN_STATE_PORT_SECURE, false);
11911194
if (err)
1192-
return err;
1195+
goto unlock;
11931196
break;
11941197
case MT76_STA_EVENT_DISASSOC:
11951198
for (i = 0; i < ARRAY_SIZE(msta_link->twt.flow); i++)
@@ -1209,8 +1212,10 @@ mt7996_mac_sta_event(struct mt7996_dev *dev, struct ieee80211_vif *vif,
12091212
break;
12101213
}
12111214
}
1215+
unlock:
1216+
mutex_unlock(&dev->mt76.mutex);
12121217

1213-
return 0;
1218+
return err;
12141219
}
12151220

12161221
static void

0 commit comments

Comments
 (0)