wifi: iwlwifi: implement can_activate_links callback

[ Upstream commit c4d32f2745c75c9041937767f0329f6f1051778b ]

This callback checks if a given bitmap of active_links
will be supported by the driver or not.

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: Gregory Greenman <gregory.greenman@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Link: https://msgid.link/20240123200528.a26fd48bfe3d.I03ae6b4c7fd24e8701660a68cec9403dc3469a0e@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Stable-dep-of: 9737da2f00d6 ("wifi: iwlwifi: mvm: fix active link counting during recovery")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
index 893b69fc841b896b234078240631d72c792a4c7e..1da4fd1c4560bb31b0eae899dc3c8eda62ca934a 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
@@ -254,9 +254,6 @@ __iwl_mvm_mld_assign_vif_chanctx(struct iwl_mvm *mvm,
        if (!rcu_access_pointer(link_conf->chanctx_conf))
                n_active++;
 
-       if (n_active > iwl_mvm_max_active_links(mvm, vif))
-               return -EOPNOTSUPP;
-
        if (WARN_ON_ONCE(!mvmvif->link[link_id]))
                return -EINVAL;
 
@@ -1122,17 +1119,12 @@ iwl_mvm_mld_change_vif_links(struct ieee80211_hw *hw,
                             struct ieee80211_bss_conf *old[IEEE80211_MLD_MAX_NUM_LINKS])
 {
        struct iwl_mvm_vif_link_info *new_link[IEEE80211_MLD_MAX_NUM_LINKS] = {};
-       unsigned int n_active = iwl_mvm_mld_count_active_links(vif);
        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
        struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
        u16 removed = old_links & ~new_links;
        u16 added = new_links & ~old_links;
        int err, i;
 
-       if (hweight16(new_links) > 1 &&
-           n_active > iwl_mvm_max_active_links(mvm, vif))
-               return -EOPNOTSUPP;
-
        for (i = 0; i < IEEE80211_MLD_MAX_NUM_LINKS; i++) {
                int r;
 
@@ -1224,6 +1216,15 @@ iwl_mvm_mld_change_sta_links(struct ieee80211_hw *hw,
        return ret;
 }
 
+static bool iwl_mvm_mld_can_activate_links(struct ieee80211_hw *hw,
+                                          struct ieee80211_vif *vif,
+                                          u16 desired_links)
+{
+       struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
+
+       return hweight16(desired_links) <= iwl_mvm_max_active_links(mvm, vif);
+}
+
 const struct ieee80211_ops iwl_mvm_mld_hw_ops = {
        .tx = iwl_mvm_mac_tx,
        .wake_tx_queue = iwl_mvm_mac_wake_tx_queue,
@@ -1318,4 +1319,5 @@ const struct ieee80211_ops iwl_mvm_mld_hw_ops = {
 
        .change_vif_links = iwl_mvm_mld_change_vif_links,
        .change_sta_links = iwl_mvm_mld_change_sta_links,
+       .can_activate_links = iwl_mvm_mld_can_activate_links,
 };