diff options
| author |  Johannes Berg <johannes.berg@intel.com>
| 2023-06-19 12:03:51 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com>
| 2023-06-19 12:04:16 +0200 |
| commit | d5a17cfb9875a873474985f630b5061a4f2142b2 (patch) | |
| tree | 14e6a9c9064c3a190ff25aa3af61316646acc36d /net/mac80211/link.c | |
| parent | wifi: ray_cs: fix stringop-truncation GCC warning (diff) | |
| parent | wifi: iwlwifi: mvm: spin_lock_bh() to fix lockdep regression (diff) | |
| download | linux-d5a17cfb9875a873474985f630b5061a4f2142b2.tar.gz linux-d5a17cfb9875a873474985f630b5061a4f2142b2.tar.bz2 linux-d5a17cfb9875a873474985f630b5061a4f2142b2.zip | |
Merge wireless into wireless-next
There are some locking changes that will later otherwise
cause conflicts, so merge wireless into wireless-next to
avoid those.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/link.c')
| -rw-r--r-- | net/mac80211/link.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/link.c b/net/mac80211/link.c index 5ec60f0d821c..55cba3760ef5 100644 --- a/net/mac80211/link.c +++ b/net/mac80211/link.c @@ -2,7 +2,7 @@ /* * MLO link handling * - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation */ #include <linux/slab.h> #include <linux/kernel.h> @@ -409,6 +409,7 @@ static int _ieee80211_set_active_links(struct ieee80211_sub_if_data *sdata, IEEE80211_CHANCTX_SHARED); WARN_ON_ONCE(ret); + ieee80211_mgd_set_link_qos_params(link); ieee80211_link_info_change_notify(sdata, link, BSS_CHANGED_ERP_CTS_PROT | BSS_CHANGED_ERP_PREAMBLE | @@ -423,7 +424,6 @@ static int _ieee80211_set_active_links(struct ieee80211_sub_if_data *sdata, BSS_CHANGED_TWT | BSS_CHANGED_HE_OBSS_PD | BSS_CHANGED_HE_BSS_COLOR); - ieee80211_mgd_set_link_qos_params(link); } old_active = sdata->vif.active_links; |