wifi: iwlwifi: mvm: skip inactive links
authorJohannes Berg <johannes.berg@intel.com>
Wed, 29 Mar 2023 07:05:23 +0000 (10:05 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 30 Mar 2023 10:08:40 +0000 (12:08 +0200)
When iterating station links, skip the links that are not
yet active by checking for mvmvif->link[] existence.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230329100039.bd9b4e64c478.Ie21422c3bf2589d22942c3c57d26e6330d2e3afc@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

index 568f0eaeb0fbc5d27f9de8a6c821a2014aa46a7d..1fd7e5bf594d0f40e4a61d43486954fdc0e89d07 100644 (file)
@@ -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 &