aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlwifi/mvm/link.c
diff options
context:
space:
mode:
authorMiri Korenblit <[email protected]>2024-05-05 06:19:48 +0000
committerJohannes Berg <[email protected]>2024-05-06 14:33:23 +0000
commitf23caa392a1b9914424f33d17b6d3ee9b34fb125 (patch)
treeec15ad0351991e1a88a8513d9c8ca9f2bbef5376 /drivers/net/wireless/intel/iwlwifi/mvm/link.c
parentwifi: iwlwifi: mvm: add a debugfs for (un)blocking EMLSR (diff)
downloadkernel-f23caa392a1b9914424f33d17b6d3ee9b34fb125.tar.gz
kernel-f23caa392a1b9914424f33d17b6d3ee9b34fb125.zip
wifi: iwlwifi: mvm: Always allow entering EMLSR from debugfs
EMLSR can't be activated from mac80211. Except for the debugfs, which is intended for testing purposes. Currently we don't allow entering EMLSR from debugfs if EMLSR is blocked, i.e. if mvmvif::esr_disable_reason is not 0. But we need a way to activate EMLSR regardless of the vif being blocked, for testing. Remove the check of esr_disable_reason Signed-off-by: Miri Korenblit <[email protected]> Link: https://msgid.link/20240505091420.bc3c24d9e0e6.Iad60e22a0d7e2b2b989051e1140b6dc98bef7bcc@changeid Signed-off-by: Johannes Berg <[email protected]>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/link.c')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/link.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/link.c b/drivers/net/wireless/intel/iwlwifi/mvm/link.c
index 32ae606a0aa7..1ce52adf3173 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/link.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/link.c
@@ -703,9 +703,9 @@ void iwl_mvm_select_links(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
primary_link = best_link->link_id;
new_active_links = BIT(best_link->link_id);
- /* eSR is not supported/allowed, or only one usable link */
- if (max_active_links == 1 || !iwl_mvm_esr_allowed_on_vif(mvm, vif) ||
- n_data == 1)
+ /* eSR is not supported/blocked, or only one usable link */
+ if (max_active_links == 1 || !iwl_mvm_vif_has_esr_cap(mvm, vif) ||
+ mvmvif->esr_disable_reason || n_data == 1)
goto set_active;
for (u8 a = 0; a < n_data; a++)