Skip to content

Commit 380038b

Browse files
Miriam-Racheljmberg-intel
authored andcommitted
wifi: iwlwifi: mld: refactor iwl_mld_valid_emlsr_pair
- Change reasons enum to a bitmask and rename it - Don't use 'else if' so all reasons will be set in the reasons bitmask Signed-off-by: Miri Korenblit <[email protected]> Reviewed-by: Emmanuel Grumbach <[email protected]> Link: https://patch.msgid.link/20250309073442.0a3b2f88fbbf.I0152bc39e828488451e85135feb044ce1f7a85d3@changeid Signed-off-by: Johannes Berg <[email protected]>
1 parent e867062 commit 380038b

File tree

1 file changed

+7
-7
lines changed
  • drivers/net/wireless/intel/iwlwifi/mld

1 file changed

+7
-7
lines changed

drivers/net/wireless/intel/iwlwifi/mld/mlo.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -748,31 +748,31 @@ iwl_mld_valid_emlsr_pair(struct ieee80211_vif *vif,
748748
{
749749
struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);
750750
struct iwl_mld *mld = mld_vif->mld;
751-
enum iwl_mld_emlsr_exit ret = 0;
751+
u32 reason_mask = 0;
752752

753753
/* Per-link considerations */
754754
if (iwl_mld_emlsr_disallowed_with_link(mld, vif, a, true) ||
755755
iwl_mld_emlsr_disallowed_with_link(mld, vif, b, false))
756756
return false;
757757

758-
if (a->chandef->chan->band == b->chandef->chan->band) {
759-
ret |= IWL_MLD_EMLSR_EXIT_EQUAL_BAND;
760-
} else if (a->chandef->width != b->chandef->width) {
758+
if (a->chandef->chan->band == b->chandef->chan->band)
759+
reason_mask |= IWL_MLD_EMLSR_EXIT_EQUAL_BAND;
760+
if (a->chandef->width != b->chandef->width) {
761761
/* TODO: task=EMLSR task=statistics
762762
* replace BANDWIDTH exit reason with channel load criteria
763763
*/
764-
ret |= IWL_MLD_EMLSR_EXIT_BANDWIDTH;
764+
reason_mask |= IWL_MLD_EMLSR_EXIT_BANDWIDTH;
765765
}
766766

767-
if (ret) {
767+
if (reason_mask) {
768768
IWL_DEBUG_INFO(mld,
769769
"Links %d and %d are not a valid pair for EMLSR\n",
770770
a->link_id, b->link_id);
771771
IWL_DEBUG_INFO(mld,
772772
"Links bandwidth are: %d and %d\n",
773773
nl80211_chan_width_to_mhz(a->chandef->width),
774774
nl80211_chan_width_to_mhz(b->chandef->width));
775-
iwl_mld_print_emlsr_exit(mld, ret);
775+
iwl_mld_print_emlsr_exit(mld, reason_mask);
776776
return false;
777777
}
778778

0 commit comments

Comments
 (0)