summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2024-03-10 15:30:53 +0200
committeriwlwifi publisher <>2024-04-17 13:09:48 +0000
commitfeb8e51e59139db8f09a956fc11349c0cf58f8a7 (patch)
treea3130cd1fba4974bcad7945a4c9bb43d691ccef0
parentda9a5388dada7e20cbfd297212118dcc16e294a0 (diff)
downloadbackport-iwlwifi-feb8e51e59139db8f09a956fc11349c0cf58f8a7.tar.gz
[BUGFIX] wifi: iwlwifi: mvm: set the primary link when !IWL_MVM_AUTO_EML_ENABLE
If IWL_MVM_AUTO_EML_ENABLE is clear, we won't be able to pick links automatically. We still need to set the primary_link of the vif. type=bugfix ticket=none fixes=I5baf0c293c89a5a28bd1a6386bf9ca6d2bf61ab8 Change-Id: Ia00cf593a7264aaac8faab53ca4628330df7c696 Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/98386 automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Tested-by: 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> x-iwlwifi-stack-dev: 68ede00dabb094a2295b01c226ddb41a30be0cfe
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/link.c4
-rw-r--r--versions2
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/link.c b/drivers/net/wireless/intel/iwlwifi/mvm/link.c
index 7a9c6a8c27..a69198ca22 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/link.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/link.c
@@ -701,8 +701,10 @@ void iwl_mvm_select_links(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
if (!mvmvif->authorized || !ieee80211_vif_is_mld(vif))
return;
- if (!IWL_MVM_AUTO_EML_ENABLE)
+ if (!IWL_MVM_AUTO_EML_ENABLE) {
+ mvmvif->primary_link = __ffs(vif->active_links);
return;
+ }
/* The logic below is a simple version that doesn't suit more than 2
* links
diff --git a/versions b/versions
index 61ee84eacf..0a3f1bb180 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)"
BACKPORTED_KERNEL_VERSION="(see git)"
BACKPORTED_KERNEL_NAME="iwlwifi"
BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11998:9e83dd4c"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11999:68ede00d"