Skip to content

Commit

Permalink
wifi: mac80211: check ieee80211_bss_info_change_notify() against MLD
Browse files Browse the repository at this point in the history
[ Upstream commit a0ca76e ]

It's not valid to call ieee80211_bss_info_change_notify() with
an sdata that's an MLD, remove the FIXME comment (it's not true)
and add a warning.

Reviewed-by: Miriam Rachel Korenblit <[email protected]>
Link: https://msgid.link/20240523121140.97a589b13d24.I61988788d81fb3cf97a490dfd3167f67a141d1fd@changeid
Signed-off-by: Johannes Berg <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
jmberg-intel authored and gregkh committed Sep 8, 2024
1 parent deffdeb commit 38c775a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion net/mac80211/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,8 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,

might_sleep();

WARN_ON_ONCE(ieee80211_vif_is_mld(&sdata->vif));

if (!changed || sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
return;

Expand Down Expand Up @@ -369,7 +371,6 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
if (changed & ~BSS_CHANGED_VIF_CFG_FLAGS) {
u64 ch = changed & ~BSS_CHANGED_VIF_CFG_FLAGS;

/* FIXME: should be for each link */
trace_drv_link_info_changed(local, sdata, &sdata->vif.bss_conf,
changed);
if (local->ops->link_info_changed)
Expand Down

0 comments on commit 38c775a

Please sign in to comment.