wifi: iwlwifi: Remove MVM prefix from TX API macros

These are not mvm specific.

Signed-off-by: Daniel Gabay <daniel.gabay@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20241228223206.1b235ec5354e.If99a38b1f0d7e42ea4ee3907e6c395846c4aa9b0@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h b/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h
index 04b177b8ef30b49a56053a0f81e554ee3256ca8d..1f23bde5720c3ad9d830878b741b6c9bf8130736 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h
@@ -482,8 +482,8 @@ struct agg_tx_status {
 #define TX_RES_RATE_TABLE_COL_GET(_f) (((_f) & TX_RES_RATE_TABLE_COLOR_MSK) >>\
                                       TX_RES_RATE_TABLE_COLOR_POS)
 
-#define IWL_MVM_TX_RES_GET_TID(_ra_tid) ((_ra_tid) & 0x0f)
-#define IWL_MVM_TX_RES_GET_RA(_ra_tid) ((_ra_tid) >> 4)
+#define IWL_TX_RES_GET_TID(_ra_tid) ((_ra_tid) & 0x0f)
+#define IWL_TX_RES_GET_RA(_ra_tid) ((_ra_tid) >> 4)
 
 /**
  * struct iwl_tx_resp_v3 - notifies that fw is TXing a packet

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index b5f6bb9cab4af0301fd01dca71ad3e562289da96..bd09bd0ca930442ee1f8f4f049e82ab75f43323f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -1626,8 +1626,8 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,
        int txq_id = SEQ_TO_QUEUE(sequence);
        /* struct iwl_tx_resp_v3 is almost the same */
        struct iwl_tx_resp *tx_resp = (void *)pkt->data;
-       int sta_id = IWL_MVM_TX_RES_GET_RA(tx_resp->ra_tid);
-       int tid = IWL_MVM_TX_RES_GET_TID(tx_resp->ra_tid);
+       int sta_id = IWL_TX_RES_GET_RA(tx_resp->ra_tid);
+       int tid = IWL_TX_RES_GET_TID(tx_resp->ra_tid);
        struct agg_tx_status *agg_status =
                iwl_mvm_get_agg_status(mvm, tx_resp);
        u32 status = le16_to_cpu(agg_status->status);
@@ -1917,8 +1917,8 @@ static void iwl_mvm_rx_tx_cmd_agg(struct iwl_mvm *mvm,
                                  struct iwl_rx_packet *pkt)
 {
        struct iwl_tx_resp *tx_resp = (void *)pkt->data;
-       int sta_id = IWL_MVM_TX_RES_GET_RA(tx_resp->ra_tid);
-       int tid = IWL_MVM_TX_RES_GET_TID(tx_resp->ra_tid);
+       int sta_id = IWL_TX_RES_GET_RA(tx_resp->ra_tid);
+       int tid = IWL_TX_RES_GET_TID(tx_resp->ra_tid);
        u16 sequence = le16_to_cpu(pkt->hdr.sequence);
        struct iwl_mvm_sta *mvmsta;
        int queue = SEQ_TO_QUEUE(sequence);