diff options
| author | Benjamin Berg <benjamin.berg@intel.com> | 2024-02-28 17:57:25 +0100 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 13:09:58 +0000 |
| commit | 9845ec3229bbe0bb42d14e5091d15715c9fc9cf3 (patch) | |
| tree | 994eecb024ef6219adad757d9e0bf4792aed6535 | |
| parent | feb8e51e59139db8f09a956fc11349c0cf58f8a7 (diff) | |
| download | backport-iwlwifi-9845ec3229bbe0bb42d14e5091d15715c9fc9cf3.tar.gz | |
[BUGFIX] wifi: mac80211: do not call ieee80211_key_switch_links during reconfig
The keys will be configured later by a call to ieee80211_reenable_keys.
type=bugfix
ticket=none
fixes=unknown
Change-Id: Iea3e7e5d8b2bb5db1dd93f6ca589e8ea1bacaf60
Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/96672
tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
x-iwlwifi-stack-dev: 18d9c6ae4aacc53bf380886e35a99dfaaed748f6
| -rw-r--r-- | net/mac80211/link.c | 6 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/net/mac80211/link.c b/net/mac80211/link.c index 4b0b939fb0..73b3b0309a 100644 --- a/net/mac80211/link.c +++ b/net/mac80211/link.c @@ -387,8 +387,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,4 +2,4 @@ BACKPORTS_VERSION="(see git)" BACKPORTED_KERNEL_VERSION="(see git)" BACKPORTED_KERNEL_NAME="iwlwifi" BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__ -BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11999:68ede00d" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:12000:18d9c6ae" |