6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilan Peer ilan.peer@intel.com
[ Upstream commit e16caea70610ed4226034dfcdaa5c43b36ff9e0a ]
When links are added, update the wireless device link addresses based on the information provided by the driver.
Signed-off-by: Ilan Peer ilan.peer@intel.com Signed-off-by: Miri Korenblit miriam.rachel.korenblit@intel.com Link: https://patch.msgid.link/20250308225541.d694a9125aba.I79b010ea9aab47893e4f22... Signed-off-by: Johannes Berg johannes.berg@intel.com Signed-off-by: Sasha Levin sashal@kernel.org --- include/net/cfg80211.h | 1 + net/wireless/mlme.c | 4 ++++ 2 files changed, 5 insertions(+)
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 363d7dd2255aa..c168b0e89b79d 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -9750,6 +9750,7 @@ struct cfg80211_mlo_reconf_done_data { u16 added_links; struct { struct cfg80211_bss *bss; + u8 *addr; } links[IEEE80211_MLD_MAX_NUM_LINKS]; };
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c index e10f2b3b4b7f6..c1b71179601db 100644 --- a/net/wireless/mlme.c +++ b/net/wireless/mlme.c @@ -1361,6 +1361,10 @@ void cfg80211_mlo_reconf_add_done(struct net_device *dev, if (data->added_links & BIT(link_id)) { wdev->links[link_id].client.current_bss = bss_from_pub(bss); + + memcpy(wdev->links[link_id].addr, + data->links[link_id].addr, + ETH_ALEN); } else { cfg80211_unhold_bss(bss_from_pub(bss)); cfg80211_put_bss(wiphy, bss);