Commit 847d7353 authored by Shaul Triebitz's avatar Shaul Triebitz Committed by Johannes Berg
Browse files

wifi: iwlwifi: mvm: consider having one active link 



Do not call iwl_mvm_mld_get_primary_link if only one link
is active.
In that case, the sole active link should be used.

iwl_mvm_mld_get_primary_link returns -1 if only one link
is active causing a warning.

Fixes: 8c9bef26 ("wifi: iwlwifi: mvm: d3: implement suspend with MLO")
Signed-off-by: default avatarShaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240311081938.6c50061bf69b.I05b0ac7fa7149eabaa5570a6f65b0d9bfb09a6f1@changeid


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

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

+9 −7
Original line number Diff line number Diff line
@@ -1260,14 +1260,14 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw, 
	if (IS_ERR_OR_NULL(vif))

		return 1;



	if (ieee80211_vif_is_mld(vif) && vif->cfg.assoc) {

	if (hweight16(vif->active_links) > 1) {

		/*

		 * Select the 'best' link. May need to revisit, it seems

		 * better to not optimize for throughput but rather range,

		 * reliability and power here - and select 2.4 GHz ...

		 * Select the 'best' link.

		 * May need to revisit, it seems better to not optimize

		 * for throughput but rather range, reliability and

		 * power here - and select 2.4 GHz ...

		 */

		primary_link =

			iwl_mvm_mld_get_primary_link(mvm, vif,

		primary_link = iwl_mvm_mld_get_primary_link(mvm, vif,

							    vif->active_links);



		if (WARN_ONCE(primary_link < 0, "no primary link in 0x%x\n",
@@ -1277,6 +1277,8 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw, 
		ret = ieee80211_set_active_links(vif, BIT(primary_link));

		if (ret)

			return ret;

	} else if (vif->active_links) {

		primary_link = __ffs(vif->active_links);

	} else {

		primary_link = 0;

	}