From: Benjamin Berg <benjamin.berg@xxxxxxxxx>
The keys will be configured later by a call to ieee80211_reenable_keys.
Signed-off-by: Benjamin Berg <benjamin.berg@xxxxxxxxx>
Reviewed-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@xxxxxxxxx>
---
net/mac80211/link.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
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)
--
2.34.1
