diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-03-20 14:50:28 +0200 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 13:40:23 +0000 |
| commit | 4e0cb7e58e0fbcf139402bce88b7833ae827901a (patch) | |
| tree | 7bc3554337ba13f6afe6c17f1f6584b392cd44c4 | |
| parent | 74d3bc076c1d5e47f7cb960c87218287c95e72a8 (diff) | |
| download | backport-iwlwifi-4e0cb7e58e0fbcf139402bce88b7833ae827901a.tar.gz | |
[BUGFIX] wifi: mac80211: fix key programming during HW restart
As _ieee80211_set_active_links() is invoked as part of recovery
in the normal way it should be handled, it really also needs to
handle keys in the normal way. Fix that.
type=bugfix
fixes=Iea3e7e5d8b2bb5db1dd93f6ca589e8ea1bacaf60
ticket=jira:WIFI-397887
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Change-Id: I3de2bad0321a95d7a3f9771484196ae1fe7ee0a5
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/100343
Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
(cherry picked from commit c76e4b476ea11ce8364757e6b34c38370819fa9f)
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/100357
PerCI-Ready: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: Benjamin Berg <benjamin.berg@intel.com>
x-iwlwifi-stack-dev: 565bff91eb9aff3c08d2294bef6924c46e18eabc
| -rw-r--r-- | net/mac80211/link.c | 6 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/net/mac80211/link.c b/net/mac80211/link.c index 75527e75b8..1917404994 100644 --- a/net/mac80211/link.c +++ b/net/mac80211/link.c @@ -387,10 +387,8 @@ static int _ieee80211_set_active_links(struct ieee80211_sub_if_data *sdata, WARN_ON_ONCE(ret); } - if (!local->in_reconfig) { - ret = ieee80211_key_switch_links(sdata, rem, add); - WARN_ON_ONCE(ret); - } + 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,5 +2,5 @@ BACKPORTS_VERSION="(see git)" BACKPORTED_KERNEL_VERSION="(see git)" BACKPORTED_KERNEL_NAME="iwlwifi" BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__ -BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12039:5b43d62c" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12040:565bff91" BACKPORTS_BRANCH_TSTAMP="Apr 17 2024 13:11:40" |