wifi: iwlwifi: Allow entering EMLSR for more band combinations

Enter EMLSR only when two bands are different.
EMLSR should be allowed when one of the link is LB.

Signed-off-by: Somashekhar(Som) <somashekhar.puttagangaiah@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20241228223206.ec659168eeb7.I403f61f0e827c14cf2b245f48e1736559f17c476@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/link.c b/drivers/net/wireless/intel/iwlwifi/mvm/link.c
index 272da41567efd5e233e5e7e5acc21b959f7706e4..1f2d281864a742b68a9b2d8437b03e99cb309680 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/link.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/link.c
@@ -762,9 +762,8 @@ bool iwl_mvm_mld_valid_link_pair(struct ieee80211_vif *vif,
            iwl_mvm_esr_disallowed_with_link(mvm, vif, b, false))
                return false;
 
-       if (a->chandef->width != b->chandef->width ||
-           !(a->chandef->chan->band == NL80211_BAND_6GHZ &&
-             b->chandef->chan->band == NL80211_BAND_5GHZ))
+       if (a->chandef->chan->band == b->chandef->chan->band ||
+           a->chandef->width != b->chandef->width)
                ret |= IWL_MVM_ESR_EXIT_BANDWIDTH;
 
        if (ret) {

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tests/links.c b/drivers/net/wireless/intel/iwlwifi/mvm/tests/links.c
index 1dc57e02219130b6bfae8cd641768910a32096e0..d692f1813d44a792bcd38b1ea885fd0175563820 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tests/links.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tests/links.c
@@ -262,7 +262,7 @@ static const struct valid_link_pair_case {
                .desc = "LB + HB, no BT.",
                .chan_a = &chan_2ghz,
                .chan_b = &chan_5ghz,
-               .valid = false,
+               .valid = true,
        },
        {
                .desc = "LB + HB, with BT.",