Skip to content

Commit

Permalink
wifi: iwlwifi: mvm: consider having one active link
Browse files Browse the repository at this point in the history
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: 8c9bef2 ("wifi: iwlwifi: mvm: d3: implement suspend with MLO")
Signed-off-by: Shaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240311081938.6c50061bf69b.I05b0ac7fa7149eabaa5570a6f65b0d9bfb09a6f1@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Shaul Triebitz authored and Johannes Berg committed Mar 25, 2024
1 parent bbe806c commit 847d735
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions drivers/net/wireless/intel/iwlwifi/mvm/d3.c
Original file line number Diff line number Diff line change
Expand Up @@ -1260,15 +1260,15 @@ 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,
vif->active_links);
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",
vif->active_links))
Expand All @@ -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;
}
Expand Down

0 comments on commit 847d735

Please sign in to comment.