Skip to content

Commit 01605ad

Browse files
committed
wifi: mac80211: fix link activation settings order
In the normal MLME code we always call ieee80211_mgd_set_link_qos_params() before ieee80211_link_info_change_notify() and some drivers, notably iwlwifi, rely on that as they don't do anything (but store the data) in their conf_tx. Fix the order here to be the same as in the normal code paths, so this isn't broken. Fixes: 3d90110 ("wifi: mac80211: implement link switching") Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Gregory Greenman <gregory.greenman@intel.com> Link: https://lore.kernel.org/r/20230608163202.a2a86bba2f80.Iac97e04827966d22161e63bb6e201b4061e9651b@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent 996c311 commit 01605ad

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

net/mac80211/link.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*
33
* MLO link handling
44
*
5-
* Copyright (C) 2022 Intel Corporation
5+
* Copyright (C) 2022-2023 Intel Corporation
66
*/
77
#include <linux/slab.h>
88
#include <linux/kernel.h>
@@ -409,6 +409,7 @@ static int _ieee80211_set_active_links(struct ieee80211_sub_if_data *sdata,
409409
IEEE80211_CHANCTX_SHARED);
410410
WARN_ON_ONCE(ret);
411411

412+
ieee80211_mgd_set_link_qos_params(link);
412413
ieee80211_link_info_change_notify(sdata, link,
413414
BSS_CHANGED_ERP_CTS_PROT |
414415
BSS_CHANGED_ERP_PREAMBLE |
@@ -423,7 +424,6 @@ static int _ieee80211_set_active_links(struct ieee80211_sub_if_data *sdata,
423424
BSS_CHANGED_TWT |
424425
BSS_CHANGED_HE_OBSS_PD |
425426
BSS_CHANGED_HE_BSS_COLOR);
426-
ieee80211_mgd_set_link_qos_params(link);
427427
}
428428

429429
old_active = sdata->vif.active_links;

0 commit comments

Comments
 (0)