Commit de107600 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: iwlwifi: mvm: check only affected links 



When hostapd starts up, it may start up with only one link
while the other is still scanning for overlapping BSSes. A
station might start to connect at this point, but we run
into this warning instead. Since there's no need to check
for _all_ links, restrict the check to just the affected
links that the STA will be using.

Fixes: 57974a55 ("wifi: iwlwifi: mvm: refactor iwl_mvm_mac_sta_state_common()")
Reported-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230620125813.c3d5a006ec21.Ib4715381f598f4c18d67cd9598ebd5cdbe7d2b09@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 1a528ab1

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+2 −1
Original line number Diff line number Diff line
@@ -3836,6 +3836,7 @@ int iwl_mvm_mac_sta_state_common(struct ieee80211_hw *hw, 
	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);

	struct ieee80211_link_sta *link_sta;

	unsigned int link_id;

	int ret;
@@ -3877,7 +3878,7 @@ int iwl_mvm_mac_sta_state_common(struct ieee80211_hw *hw, 
	mutex_lock(&mvm->mutex);



	/* this would be a mac80211 bug ... but don't crash */

	for_each_mvm_vif_valid_link(mvmvif, link_id) {

	for_each_sta_active_link(vif, sta, link_sta, link_id) {

		if (WARN_ON_ONCE(!mvmvif->link[link_id]->phy_ctxt)) {

			mutex_unlock(&mvm->mutex);

			return test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED,