diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-03-21 08:54:41 +0100 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 13:40:44 +0000 |
| commit | 71202c2c75b8cbbc8662ac240a8c155c9f76f7b9 (patch) | |
| tree | 4b17bf3a2870ad23dedb6b4f9bdf48d042aa03d1 | |
| parent | 857ecc98cd7aca1e74b369dcf48b124046c4912f (diff) | |
| download | backport-iwlwifi-71202c2c75b8cbbc8662ac240a8c155c9f76f7b9.tar.gz | |
[BUGFIX] wifi: iwlwifi: mvm: fix check in iwl_mvm_sta_fw_id_mask
In the previous commit, I renamed the variable to differentiate
mac80211/mvm link STA, but forgot to adjust the check. The one
from mac80211 is already non-NULL anyway, but the mvm one can
be NULL when the mac80211 isn't during link switch conditions.
Fix the check.
type=bugfix
fixes=I6357f05c55ef111002ddc169287eb356ca0c1b21
ticket=jira:WIFI-398442
Change-Id: I8c0119fce7b00cb4f65782930d2c167ed5dd0a6e
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/100497
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>
Reviewed-by: Daniel Gabay <daniel.gabay@intel.com>
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
(cherry picked from commit 5a5b6559577cc47a6a23156df77588aedaec79b4)
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/100364
PerCI-Ready: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
x-iwlwifi-stack-dev: 24ae9abb59f5aa92aa5d33ec9e80f6c449bac921
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 2 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c index 659f3e5243..e2723959a6 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c @@ -36,7 +36,7 @@ u32 iwl_mvm_sta_fw_id_mask(struct iwl_mvm *mvm, struct ieee80211_sta *sta, mvm_link_sta = rcu_dereference_check(mvmsta->link[link_id], lockdep_is_held(&mvm->mutex)); - if (!link_sta) + if (!mvm_link_sta) continue; result |= BIT(mvm_link_sta->sta_id); @@ -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:12041:efa5c951" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12042:24ae9abb" BACKPORTS_BRANCH_TSTAMP="Apr 17 2024 13:11:40" |