wifi: iwlwifi: remove MVM prefix from FW macros

These are not mvm specific.

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Link: https://patch.msgid.link/20240729201718.939b32f84f46.I293957bf172680871eba24448d9d1870e49100b6@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h b/drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h
index ca6fa66d1917a1bca28841363864243ea97c9212..b9ed42faa63e4ee32f4e78611a5e3a52edae3b9e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h
@@ -524,8 +524,8 @@ struct iwl_link_config_cmd {
 /* Currently FW supports link ids in the range 0-3 and can have
  * at most two active links for each vif.
  */
-#define IWL_MVM_FW_MAX_ACTIVE_LINKS_NUM 2
-#define IWL_MVM_FW_MAX_LINK_ID 3
+#define IWL_FW_MAX_ACTIVE_LINKS_NUM 2
+#define IWL_FW_MAX_LINK_ID 3
 
 /**
  * enum iwl_fw_sta_type - FW station types

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/stats.h b/drivers/net/wireless/intel/iwlwifi/fw/api/stats.h
index 2271b19213fab3931f45c589da3e7952e6eac0c1..659cb40ecfb46bc855c883658f8cb7c29e4e655b 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/stats.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/stats.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
 /*
- * Copyright (C) 2012-2014, 2018, 2020 - 2021, 2023 Intel Corporation
+ * Copyright (C) 2012-2014, 2018, 2020 - 2021, 2023 - 2024 Intel Corporation
  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH
  * Copyright (C) 2016-2017 Intel Deutschland GmbH
  */
@@ -594,7 +594,7 @@ struct iwl_stats_ntfy_per_sta {
 } __packed; /* STATISTICS_NTFY_PER_STA_API_S_VER_1 */
 
 #define IWL_STATS_MAX_PHY_OPERATIONAL 3
-#define IWL_STATS_MAX_FW_LINKS (IWL_MVM_FW_MAX_LINK_ID + 1)
+#define IWL_STATS_MAX_FW_LINKS (IWL_FW_MAX_LINK_ID + 1)
 
 /**
  * struct iwl_system_statistics_notif_oper

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index e279fd409b6faf957dfde4acc794f6867ea48019..08546e673cf51ea5dbec8702453fa9c44862e9a0 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -1483,7 +1483,7 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
                RCU_INIT_POINTER(mvm->fw_id_to_link_sta[i], NULL);
        }
 
-       for (i = 0; i < IWL_MVM_FW_MAX_LINK_ID + 1; i++)
+       for (i = 0; i < IWL_FW_MAX_LINK_ID + 1; i++)
                RCU_INIT_POINTER(mvm->link_id_to_link_conf[i], NULL);
 
        mvm->tdls_cs.peer.sta_id = IWL_MVM_INVALID_STA;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 22f48b66d79c77d825a7861f4839ddf94aff8344..e2cc378d6d91d019e6c36d0f147733fd5bff403d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -1164,7 +1164,7 @@ struct iwl_mvm {
 
        struct ieee80211_vif __rcu *vif_id_to_mac[NUM_MAC_INDEX_DRIVER];
 
-       struct ieee80211_bss_conf __rcu *link_id_to_link_conf[IWL_MVM_FW_MAX_LINK_ID + 1];
+       struct ieee80211_bss_conf __rcu *link_id_to_link_conf[IWL_FW_MAX_LINK_ID + 1];
 
        /* -1 for always, 0 for never, >0 for that many times */
        s8 fw_restart;
@@ -1745,7 +1745,7 @@ static inline int iwl_mvm_max_active_links(struct iwl_mvm *mvm,
        if (iwl_mvm_is_esr_supported(trans) ||
            (CSR_HW_RFID_TYPE(trans->hw_rf_id) == IWL_CFG_RF_TYPE_FM &&
             CSR_HW_RFID_IS_CDB(trans->hw_rf_id)))
-               return IWL_MVM_FW_MAX_ACTIVE_LINKS_NUM;
+               return IWL_FW_MAX_ACTIVE_LINKS_NUM;
 
        return 1;
 }

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
index 151289e13308027ba893f76d164fe127717dbbad..bc8078875c5af93e2d37a29734dc5806c2efcad9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
@@ -991,7 +991,7 @@ static void iwl_mvm_update_esr_mode_tpt(struct iwl_mvm *mvm)
                spin_lock_bh(&mvmsta->mpdu_counters[q].lock);
 
                /* The link IDs that doesn't exist will contain 0 */
-               for (int link = 0; link < IWL_MVM_FW_MAX_LINK_ID; link++) {
+               for (int link = 0; link < IWL_FW_MAX_LINK_ID; link++) {
                        total_tx += mvmsta->mpdu_counters[q].per_link[link].tx;
                        total_rx += mvmsta->mpdu_counters[q].per_link[link].rx;
                }

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
index 15e64d94d6ea7944dd8808a28226b4c167b71f0c..550c97a014b901903c84268f9f14de2687e02613 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
@@ -4458,7 +4458,7 @@ void iwl_mvm_count_mpdu(struct iwl_mvm_sta *mvm_sta, u8 fw_sta_id, u32 count,
                IWL_DEBUG_STATS(mvm, "MPDU counters are cleared\n");
        }
 
-       for (int i = 0; i < IWL_MVM_FW_MAX_LINK_ID; i++)
+       for (int i = 0; i < IWL_FW_MAX_LINK_ID; i++)
                total_mpdus += tx ? queue_counter->per_link[i].tx :
                                    queue_counter->per_link[i].rx;
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.h b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h
index 0dc83d6afb3c566b769ec32cbbec3b8bd9a77fc3..193a1edc38d2c96cba6bd2608c817817d3cca927 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h
@@ -361,7 +361,7 @@ struct iwl_mvm_mpdu_counter {
  */
 struct iwl_mvm_tpt_counter {
        spinlock_t lock;
-       struct iwl_mvm_mpdu_counter per_link[IWL_MVM_FW_MAX_LINK_ID];
+       struct iwl_mvm_mpdu_counter per_link[IWL_FW_MAX_LINK_ID];
        unsigned long window_start;
 } ____cacheline_aligned_in_smp;