diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2023-04-16 15:47:30 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2023-04-17 10:53:24 +0300 |
| commit | 66a588bff29e61345df6d281c56d9864b84eb8cc (patch) | |
| tree | 9c21866bf0cc29b0ca92ef3bdfe31dee7da93c8e /drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c | |
| parent | bb7fcb37c9004ce7e296f7bb4e56ce65119b83b4 (diff) | |
| download | linux-66a588bff29e61345df6d281c56d9864b84eb8cc.tar.xz | |
wifi: iwlwifi: mvm: factor out iwl_mvm_sta_fw_id_mask()
We are going to need this in more places than just the
key code, so factor out the functionality of getting
the FW station ID mask (filtered to a specific link if
needed) to a separate function that can now be called
both under RCU and mvm->mutex protection.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230416154301.eff92b93025d.I2c50290a0537d5db3d3460f4d57c78a4712ffb75@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c index 7c417b39aca4..a8ab35473924 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c @@ -15,10 +15,6 @@ static u32 iwl_mvm_get_sec_sta_mask(struct iwl_mvm *mvm, { struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); struct iwl_mvm_vif_link_info *link_info = &mvmvif->deflink; - struct iwl_mvm_link_sta *link_sta; - struct iwl_mvm_sta *mvmsta; - u32 result = 0; - int link_id; lockdep_assert_held(&mvm->mutex); @@ -49,33 +45,10 @@ static u32 iwl_mvm_get_sec_sta_mask(struct iwl_mvm *mvm, if (!sta && (keyconf->link_id >= 0 || !vif->valid_links)) return BIT(link_info->ap_sta_id); - /* this shouldn't happen now */ - if (!sta) - return 0; + /* STA should be non-NULL now, but iwl_mvm_sta_fw_id_mask() checks */ - mvmsta = iwl_mvm_sta_from_mac80211(sta); - - /* it's easy when the STA is not an MLD */ - if (!sta->valid_links) - return BIT(mvmsta->deflink.sta_id); - - /* but if it is an MLD, get the mask of all the FW STAs it has ... */ - for (link_id = 0; link_id < ARRAY_SIZE(mvmsta->link); link_id++) { - /* unless we have a specific link in mind (GTK on client) */ - if (keyconf->link_id >= 0 && - keyconf->link_id != link_id) - continue; - - link_sta = - rcu_dereference_protected(mvmsta->link[link_id], - lockdep_is_held(&mvm->mutex)); - if (!link_sta) - continue; - - result |= BIT(link_sta->sta_id); - } - - return result; + /* pass link_id to filter by it if not -1 (GTK on client) */ + return iwl_mvm_sta_fw_id_mask(mvm, sta, keyconf->link_id); } static u32 iwl_mvm_get_sec_flags(struct iwl_mvm *mvm, |