From f14ad95a5d9086efba664eeb9f1f02fd8bc08c65 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 29 Mar 2023 10:05:23 +0300 Subject: [PATCH] wifi: iwlwifi: mvm: skip inactive links When iterating station links, skip the links that are not yet active by checking for mvmvif->link[] existence. Signed-off-by: Johannes Berg Signed-off-by: Gregory Greenman Link: https://lore.kernel.org/r/20230329100039.bd9b4e64c478.Ie21422c3bf2589d22942c3c57d26e6330d2e3afc@changeid Signed-off-by: Johannes Berg --- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index 568f0eaeb0fb..1fd7e5bf594d 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c @@ -3657,7 +3657,7 @@ static void iwl_mvm_vif_set_he_support(struct ieee80211_hw *hw, struct ieee80211_bss_conf *link_conf = rcu_dereference_protected(vif->link_conf[i], 1); - if (!link_conf || !link_sta) + if (!link_conf || !link_sta || !mvmvif->link[i]) continue; link_conf->he_support = link_sta->he_cap.has_he; @@ -3757,6 +3757,8 @@ iwl_mvm_sta_state_auth_to_assoc(struct ieee80211_hw *hw, if (WARN_ON(!link_conf)) return -EINVAL; + if (!mvmvif->link[i]) + continue; iwl_mvm_link_changed(mvm, vif, link_conf, LINK_CONTEXT_MODIFY_ALL & -- 2.11.0