wifi: iwlwifi: mvm: update mac id management

The restriction where MAC ID 0 could be used only for the
managed/IBSS vif is not required when using the new MLO FW API.
Update the driver.

Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230417113648.e4355615da92.Iba934ccf8589c3c27a25a390dc5e938312889b45@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index 389eef453d175c3b06b21bcbbaf4f175068a4c98..cc90f2884cff62155e1b0252e12029f31bbfcbaf 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -225,16 +225,20 @@ int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
         * that we should share it with another interface.
         */
 
-       /* Currently, MAC ID 0 should be used only for the managed/IBSS vif */
-       switch (vif->type) {
-       case NL80211_IFTYPE_ADHOC:
-               break;
-       case NL80211_IFTYPE_STATION:
-               if (!vif->p2p)
+       /* MAC ID 0 should be used only for the managed/IBSS vif with non-MLO
+        * FW API
+        */
+       if (!mvm->mld_api_is_used) {
+               switch (vif->type) {
+               case NL80211_IFTYPE_ADHOC:
                        break;
-               fallthrough;
-       default:
-               __clear_bit(0, data.available_mac_ids);
+               case NL80211_IFTYPE_STATION:
+                       if (!vif->p2p)
+                               break;
+                       fallthrough;
+               default:
+                       __clear_bit(0, data.available_mac_ids);
+               }
        }
 
        ieee80211_iterate_active_interfaces_atomic(