summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>2024-03-20 11:18:44 +0200
committeriwlwifi publisher <>2024-04-17 13:40:13 +0000
commit74d3bc076c1d5e47f7cb960c87218287c95e72a8 (patch)
treeb9d2a6c7a1a98c158316fddf729f8dcca3c9c97a
parent268a125d296e2ead7c49830bdc7c2bfedd21f785 (diff)
downloadbackport-iwlwifi-74d3bc076c1d5e47f7cb960c87218287c95e72a8.tar.gz
[BUGFIX] wifi: iwlwifi: mvm: fix primary link setting
mvmvif::primary link holds the ID and not a bitmap. Fix this type=bugfix ticket=none fixes=Ib218ca98c752004aaf1a994e1252cd82472bf8ab Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Change-Id: Ia9297991ff2fdc82ae7c730e0069e2dd6e5f2902 Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/100262 tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> 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> Reviewed-by: Johannes Berg <johannes.berg@intel.com> (cherry picked from commit d457a6517729233170bcb30296f9d410160346a0) Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/100352 PerCI-Ready: Johannes Berg <johannes.berg@intel.com> x-iwlwifi-stack-dev: 5b43d62c46f000c1125626c094ced3b9f38eea86
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c2
-rw-r--r--versions2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
index 88786fd5f2..be951b5c1f 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
@@ -1219,7 +1219,7 @@ iwl_mvm_mld_change_vif_links(struct ieee80211_hw *hw,
* Ensure we always have a valid primary_link, the real
* decision happens later when PHY is activated.
*/
- mvmvif->primary_link = BIT(__ffs(new_links));
+ mvmvif->primary_link = __ffs(new_links);
}
out_err:
diff --git a/versions b/versions
index c3d15554c1..5eeb8fd808 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:12038:44b3202c"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12039:5b43d62c"
BACKPORTS_BRANCH_TSTAMP="Apr 17 2024 13:11:40"