diff mbox series

[1/8] wifi: mac80211: do not call ieee80211_key_switch_links during reconfig

Message ID 20240320091155.6ab8520bd4a1.Iea3e7e5d8b2bb5db1dd93f6ca589e8ea1bacaf60@changeid (mailing list archive)
State Rejected
Delegated to: Johannes Berg
Headers show
Series cfg80211/mac80211 patches from our internal tree 2024-03-20 | expand

Commit Message

Miri Korenblit March 20, 2024, 7:13 a.m. UTC 
From: Benjamin Berg <benjamin.berg@intel.com>

The keys will be configured later by a call to ieee80211_reenable_keys.

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
---
 net/mac80211/link.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Johannes Berg March 20, 2024, 12:57 p.m. UTC | #1 
On Wed, 2024-03-20 at 09:13 +0200, Miri Korenblit wrote:
> From: Benjamin Berg <benjamin.berg@intel.com>
> 
> The keys will be configured later by a call to ieee80211_reenable_keys.
> 

After patch 8 in this series this is actually wrong and I'm reverting it
internally, so I'll just drop this one.

johannes
diff mbox series

Patch

diff --git a/net/mac80211/link.c b/net/mac80211/link.c
index 685ec66b4264..7f01462f84e9 100644
--- a/net/mac80211/link.c
+++ b/net/mac80211/link.c
@@ -375,8 +375,10 @@  static int _ieee80211_set_active_links(struct ieee80211_sub_if_data *sdata,
 		WARN_ON_ONCE(ret);
 	}
 
-	ret = ieee80211_key_switch_links(sdata, rem, add);
-	WARN_ON_ONCE(ret);
+	if (!local->in_reconfig) {
+		ret = ieee80211_key_switch_links(sdata, rem, add);
+		WARN_ON_ONCE(ret);
+	}
 
 	list_for_each_entry(sta, &local->sta_list, list) {
 		if (sdata != sta->sdata)