Skip to content

Commit 950a3f5

Browse files
committed
wifi: iwlwifi: mvm: don't reset link selection during restart
After restart, we might want to end up with the same config as before, even for multi-link/EMLSR. Therefore, don't reset the stored link selection result in that case. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Link: https://msgid.link/20240505091420.e81db303f1dc.Ie8267082f623d14376a2052d222e18da6545f34b@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent 966a4d9 commit 950a3f5

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3937,9 +3937,12 @@ iwl_mvm_sta_state_assoc_to_authorized(struct iwl_mvm *mvm,
39373937
WARN_ON(iwl_mvm_enable_beacon_filter(mvm, vif));
39383938

39393939
mvmvif->authorized = 1;
3940-
mvmvif->link_selection_res = vif->active_links;
3941-
mvmvif->link_selection_primary =
3942-
vif->active_links ? __ffs(vif->active_links) : 0;
3940+
3941+
if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) {
3942+
mvmvif->link_selection_res = vif->active_links;
3943+
mvmvif->link_selection_primary =
3944+
vif->active_links ? __ffs(vif->active_links) : 0;
3945+
}
39433946

39443947
callbacks->mac_ctxt_changed(mvm, vif, false);
39453948
iwl_mvm_mei_host_associated(mvm, vif, mvm_sta);

0 commit comments

Comments
 (0)