diff options
| author | Benjamin Berg <benjamin.berg@intel.com> | 2024-03-05 16:24:07 +0100 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 13:36:10 +0000 |
| commit | 731f5e2687561be5010aa0bfdbce0082913eca49 (patch) | |
| tree | f54478dbbb4b6799d61065c2f5a5a925c23ebaf3 | |
| parent | 07df8c1dc96acd4bfee8ffd8e75cef8bd52a442b (diff) | |
| download | backport-iwlwifi-731f5e2687561be5010aa0bfdbce0082913eca49.tar.gz | |
[BUGFIX] wifi: iwlwifi: mvm: mark EMLSR disabled in cleanup iterator
During HW restart only one link will be active initially and other links
are only activated again later on. With only a single link EMLSR cannot
be enabled and having it marked enabled confuses the internal state.
Mark EMLSR as disabled in the cleanup iterator, it can be reenabled
later one once this is possible.
type=bugfix
ticket=none
fixes=unknown
Change-Id: Ic4d50695b9bb332190dc712473096083aa96074b
Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/97642
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: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/99151
Reviewed-by: Golan Ben Ami <golan.ben.ami@intel.com>
PerCI-Ready: Golan Ben Ami <golan.ben.ami@intel.com>
x-iwlwifi-stack-dev: 49d204b1625cbef0e54e9d0409a2f81d96170805
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 3 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index 7f0c6ad195..71c8332b47 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c @@ -1217,6 +1217,9 @@ static void iwl_mvm_cleanup_iterator(void *data, u8 *mac, mvmvif->ba_enabled = false; mvmvif->ap_sta = NULL; + mvmvif->esr_active = false; + vif->driver_flags &= ~IEEE80211_VIF_EML_ACTIVE; + for_each_mvm_vif_valid_link(mvmvif, link_id) { mvmvif->link[link_id]->ap_sta_id = IWL_MVM_INVALID_STA; mvmvif->link[link_id]->fw_link_id = IWL_MVM_FW_LINK_ID_INVALID; @@ -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:12014:b26b3df9" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12015:49d204b1" BACKPORTS_BRANCH_TSTAMP="Apr 17 2024 13:11:40" |