summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2024-03-19 13:24:06 +0200
committeriwlwifi publisher <>2024-04-17 13:39:22 +0000
commit70634ff1b51efc751be90a6855947ba343ee4f30 (patch)
tree62728cc868bdcc9b1ffd1c878a851f14e933f579
parentb5d887820bedd910fe5555464716be32042e7eb6 (diff)
downloadbackport-iwlwifi-70634ff1b51efc751be90a6855947ba343ee4f30.tar.gz
[BUGFIX] wifi: iwlwifi: mvm: don't change BA sessions during restart
During restart, we haven't added BA sessions, so we also cannot change them to switch between links when that happens in restart. Short-circuit the appropriate function. type=bugfix fixes=unknown ticket=jira:WIFI-396982 Signed-off-by: Johannes Berg <johannes.berg@intel.com> Change-Id: Ic604d384e660c755308a49a79d3f7e78bc27597c Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/100020 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> Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/100280 Reviewed-by: Golan Ben Ami <golan.ben.ami@intel.com> x-iwlwifi-stack-dev: 7464e1be397a75a6d1c9c23fae36d8461a2b8803
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c4
-rw-r--r--versions2
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
index 3ddf06abf1..659f3e5243 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
@@ -999,6 +999,10 @@ static int iwl_mvm_mld_update_sta_baids(struct iwl_mvm *mvm,
u32 cmd_id = WIDE_ID(DATA_PATH_GROUP, RX_BAID_ALLOCATION_CONFIG_CMD);
int baid;
+ /* mac80211 will remove sessions later, but we ignore all that */
+ if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status))
+ return 0;
+
BUILD_BUG_ON(sizeof(struct iwl_rx_baid_cfg_resp) != sizeof(baid));
for (baid = 0; baid < ARRAY_SIZE(mvm->baid_map); baid++) {
diff --git a/versions b/versions
index 0f8f1345e1..d7c5b626f3 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:12033:1f552791"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12034:7464e1be"
BACKPORTS_BRANCH_TSTAMP="Apr 17 2024 13:11:40"