summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2024-03-19 15:30:09 +0200
committeriwlwifi publisher <>2024-04-17 13:39:43 +0000
commitfb418288c1b448d9c641586e240e6e910e037289 (patch)
tree8ca6872b713c308af6b81d47e09e48bdc6c055b4
parentf4bd38a8a4c2748965bfc14e0427247f572b5ef0 (diff)
downloadbackport-iwlwifi-fb418288c1b448d9c641586e240e6e910e037289.tar.gz
[BUGFIX] wifi: iwlwifi: reconfigure TLC during HW restart
Since the HW restart flow with multi-link is very similar to the initial association, we do need to reconfigure TLC there. Remove the check that prevented that. type=bugfix ticket=jira:WIFI-396982 fixes=I42022f24bbe3572f5a082da8c99794ae14281875 Signed-off-by: Johannes Berg <johannes.berg@intel.com> Change-Id: Ic798beccbb7b7d852dc976d539205353588853b0 Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/100087 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> Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com> Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/100282 Reviewed-by: Golan Ben Ami <golan.ben.ami@intel.com> x-iwlwifi-stack-dev: 2cfc25d70da7797ddf813fad168f47b36ba03b7c
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c7
-rw-r--r--versions2
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
index 7e436e9e49..88786fd5f2 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
@@ -360,13 +360,8 @@ static int __iwl_mvm_mld_assign_vif_chanctx(struct iwl_mvm *mvm,
* this needs the phy context assigned (and in FW?), and we cannot
* do it later because it needs to be initialized as soon as we're
* able to TX on the link, i.e. when active.
- *
- * Firmware restart isn't quite correct yet for MLO, but we don't
- * need to do it in that case anyway since it will happen from the
- * normal station state callback.
*/
- if (mvmvif->ap_sta &&
- !test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) {
+ if (mvmvif->ap_sta) {
struct ieee80211_link_sta *link_sta;
rcu_read_lock();
diff --git a/versions b/versions
index 73e4b40726..6c0d2618e8 100644
--- a/versions
+++ b/versions
@@ -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:12035:6db370dd"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12036:2cfc25d7"
BACKPORTS_BRANCH_TSTAMP="Apr 17 2024 13:11:40"