All of lore.kernel.org
 help / color / mirror / Atom feed
From: Miri Korenblit <miriam.rachel.korenblit@intel.com>
To: johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org, Johannes Berg <johannes.berg@intel.com>
Subject: [PATCH 15/17] wifi: iwlwifi: mvm: select STA mask only for active links
Date: Wed, 20 Mar 2024 23:26:36 +0200	[thread overview]
Message-ID: <20240320232419.c6818d1c6033.I6357f05c55ef111002ddc169287eb356ca0c1b21@changeid> (raw)
In-Reply-To: <20240320212638.1446082-1-miriam.rachel.korenblit@intel.com>

From: Johannes Berg <johannes.berg@intel.com>

During reconfig, we might send keys, but those should be only
sent to already active link stations. Iterate only active ones
to fix that issue.

Fixes: aea99650f731 ("wifi: iwlwifi: mvm: set STA mask for keys in MLO")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
index 902c64f210aa..5785b70a4aff 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
@@ -9,7 +9,9 @@
 u32 iwl_mvm_sta_fw_id_mask(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
 			   int filter_link_id)
 {
+	struct ieee80211_link_sta *link_sta;
 	struct iwl_mvm_sta *mvmsta;
+	struct ieee80211_vif *vif;
 	unsigned int link_id;
 	u32 result = 0;
 
@@ -17,26 +19,27 @@ u32 iwl_mvm_sta_fw_id_mask(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
 		return 0;
 
 	mvmsta = iwl_mvm_sta_from_mac80211(sta);
+	vif = mvmsta->vif;
 
 	/* 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++) {
-		struct iwl_mvm_link_sta *link_sta;
+	for_each_sta_active_link(vif, sta, link_sta, link_id) {
+		struct iwl_mvm_link_sta *mvm_link_sta;
 
 		/* unless we have a specific link in mind */
 		if (filter_link_id >= 0 && link_id != filter_link_id)
 			continue;
 
-		link_sta =
+		mvm_link_sta =
 			rcu_dereference_check(mvmsta->link[link_id],
 					      lockdep_is_held(&mvm->mutex));
 		if (!link_sta)
 			continue;
 
-		result |= BIT(link_sta->sta_id);
+		result |= BIT(mvm_link_sta->sta_id);
 	}
 
 	return result;
-- 
2.34.1


  parent reply	other threads:[~2024-03-20 21:27 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-20 21:26 [PATCH 00/17] wifi: iwlwifi: updates - 2024-03-20 Miri Korenblit
2024-03-20 21:26 ` [PATCH 01/17] wifi: iwlwifi: mvm: include link ID when releasing frames Miri Korenblit
2024-03-20 21:26 ` [PATCH 02/17] wifi: iwlwifi: mvm: guard against invalid STA ID on removal Miri Korenblit
2024-03-20 21:26 ` [PATCH 03/17] wifi: iwlwifi: mvm: assign link STA ID lookups during restart Miri Korenblit
2024-03-20 21:26 ` [PATCH 04/17] wifi: iwlwifi: mvm: fix active link counting during recovery Miri Korenblit
2024-03-20 21:26 ` [PATCH 05/17] wifi: iwlwifi: mvm: mark EMLSR disabled in cleanup iterator Miri Korenblit
2024-03-20 21:26 ` [PATCH 06/17] wifi: iwlwifi: remove devices that never came out Miri Korenblit
2024-03-20 21:26 ` [PATCH 07/17] wifi: iwlwifi: remove wrong CRF_IDs Miri Korenblit
2024-03-20 21:26 ` [PATCH 08/17] wifi: iwlwifi: Print a specific device name Miri Korenblit
2024-03-20 21:26 ` [PATCH 09/17] wifi: iwlwifi: add support for BZ_W Miri Korenblit
2024-03-20 21:26 ` [PATCH 10/17] wifi: iwlwifi: mvm: Remove outdated comment Miri Korenblit
2024-03-20 21:26 ` [PATCH 11/17] wifi: iwlwifi: mvm: handle debugfs names more carefully Miri Korenblit
2024-03-20 21:26 ` [PATCH 12/17] wifi: iwlwifi: mvm: Declare HE/EHT capabilities support for P2P interfaces Miri Korenblit
2024-03-20 21:26 ` [PATCH 13/17] wifi: iwlwifi: Add support for LARI_CONFIG_CHANGE_CMD cmd v9 Miri Korenblit
2024-03-20 21:26 ` [PATCH 14/17] wifi: iwlwifi: mvm: set wider BW OFDMA ignore correctly Miri Korenblit
2024-03-20 21:26 ` Miri Korenblit [this message]
2024-03-25 14:27   ` [PATCH 15/17] wifi: iwlwifi: mvm: select STA mask only for active links Johannes Berg
2024-03-20 21:26 ` [PATCH 16/17] wifi: iwlwifi: mvm: don't change BA sessions during restart Miri Korenblit
2024-03-20 21:26 ` [PATCH 17/17] wifi: iwlwifi: reconfigure TLC during HW restart Miri Korenblit

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240320232419.c6818d1c6033.I6357f05c55ef111002ddc169287eb356ca0c1b21@changeid \
    --to=miriam.rachel.korenblit@intel.com \
    --cc=johannes.berg@intel.com \
    --cc=johannes@sipsolutions.net \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.