wifi: iwlwifi: rename modulation type values

The modulation type values aren't masks, they're just values.
Rename them from RATE_MCS_CCK_* to RATE_MCS_MOD_TYPE_*.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250504132447.aa79635dd4e6.Ie97a01fee1ef4aedf8a2e5447489793ce8c15ca0@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h b/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h
index df176191d65972018e783c873293e0b5ca042adf..86a265aa7e253c9cc416ef7715cd120cc7a3ff48 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h
@@ -556,12 +556,12 @@ enum {
  */
 #define RATE_MCS_MOD_TYPE_POS          8
 #define RATE_MCS_MOD_TYPE_MSK          (0x7 << RATE_MCS_MOD_TYPE_POS)
-#define RATE_MCS_CCK_MSK               (0 << RATE_MCS_MOD_TYPE_POS)
-#define RATE_MCS_LEGACY_OFDM_MSK       (1 << RATE_MCS_MOD_TYPE_POS)
-#define RATE_MCS_HT_MSK                        (2 << RATE_MCS_MOD_TYPE_POS)
-#define RATE_MCS_VHT_MSK               (3 << RATE_MCS_MOD_TYPE_POS)
-#define RATE_MCS_HE_MSK                        (4 << RATE_MCS_MOD_TYPE_POS)
-#define RATE_MCS_EHT_MSK               (5 << RATE_MCS_MOD_TYPE_POS)
+#define RATE_MCS_MOD_TYPE_CCK          (0 << RATE_MCS_MOD_TYPE_POS)
+#define RATE_MCS_MOD_TYPE_LEGACY_OFDM  (1 << RATE_MCS_MOD_TYPE_POS)
+#define RATE_MCS_MOD_TYPE_HT           (2 << RATE_MCS_MOD_TYPE_POS)
+#define RATE_MCS_MOD_TYPE_VHT          (3 << RATE_MCS_MOD_TYPE_POS)
+#define RATE_MCS_MOD_TYPE_HE           (4 << RATE_MCS_MOD_TYPE_POS)
+#define RATE_MCS_MOD_TYPE_EHT          (5 << RATE_MCS_MOD_TYPE_POS)
 
 /*
  * Legacy CCK rate format for bits 0:3:

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/rs.c b/drivers/net/wireless/intel/iwlwifi/fw/rs.c
index 9e5603774637f21ee919d334042c786c20e1dc71..326c2623d0763693ef6ca25a246c553463cae8e0 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/rs.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/rs.c
@@ -116,7 +116,7 @@ u32 iwl_new_rate_from_v1(u32 rate_v1)
        if (rate_v1 & RATE_MCS_HT_MSK_V1) {
                u32 nss = 0;
 
-               rate_v2 |= RATE_MCS_HT_MSK;
+               rate_v2 |= RATE_MCS_MOD_TYPE_HT;
                rate_v2 |=
                        rate_v1 & RATE_HT_MCS_RATE_CODE_MSK_V1;
                nss = (rate_v1 & RATE_HT_MCS_MIMO2_MSK) >>
@@ -150,9 +150,9 @@ u32 iwl_new_rate_from_v1(u32 rate_v1)
                        rate_v2 |= he_type << RATE_MCS_HE_TYPE_POS;
                        rate_v2 |= he_106t << RATE_MCS_HE_106T_POS;
                        rate_v2 |= rate_v1 & RATE_HE_DUAL_CARRIER_MODE_MSK;
-                       rate_v2 |= RATE_MCS_HE_MSK;
+                       rate_v2 |= RATE_MCS_MOD_TYPE_HE;
                } else {
-                       rate_v2 |= RATE_MCS_VHT_MSK;
+                       rate_v2 |= RATE_MCS_MOD_TYPE_VHT;
                }
        /* if legacy format */
        } else {
@@ -164,7 +164,7 @@ u32 iwl_new_rate_from_v1(u32 rate_v1)
 
                rate_v2 |= legacy_rate;
                if (!(rate_v1 & RATE_MCS_CCK_MSK_V1))
-                       rate_v2 |= RATE_MCS_LEGACY_OFDM_MSK;
+                       rate_v2 |= RATE_MCS_MOD_TYPE_LEGACY_OFDM;
        }
 
        /* convert flags */
@@ -197,36 +197,40 @@ int rs_pretty_print_rate(char *buf, int bufsz, const u32 rate)
        u32 bw = (rate & RATE_MCS_CHAN_WIDTH_MSK) >>
                RATE_MCS_CHAN_WIDTH_POS;
        u32 format = rate & RATE_MCS_MOD_TYPE_MSK;
+       int index = 0;
        bool sgi;
 
-       if (format == RATE_MCS_CCK_MSK ||
-           format == RATE_MCS_LEGACY_OFDM_MSK) {
-               int legacy_rate = rate & RATE_LEGACY_RATE_MSK;
-               int index = format == RATE_MCS_CCK_MSK ?
-                       legacy_rate :
-                       legacy_rate + IWL_FIRST_OFDM_RATE;
+       switch (format) {
+       case RATE_MCS_MOD_TYPE_LEGACY_OFDM:
+               index = IWL_FIRST_OFDM_RATE;
+               fallthrough;
+       case RATE_MCS_MOD_TYPE_CCK:
+               index += rate & RATE_LEGACY_RATE_MSK;
 
                return scnprintf(buf, bufsz, "Legacy | ANT: %s Rate: %s Mbps",
                                 iwl_rs_pretty_ant(ant),
                                 iwl_rate_mcs(index)->mbps);
-       }
-
-       if (format ==  RATE_MCS_VHT_MSK)
+       case RATE_MCS_MOD_TYPE_VHT:
                type = "VHT";
-       else if (format ==  RATE_MCS_HT_MSK)
+               break;
+       case RATE_MCS_MOD_TYPE_HT:
                type = "HT";
-       else if (format == RATE_MCS_HE_MSK)
+               break;
+       case RATE_MCS_MOD_TYPE_HE:
                type = "HE";
-       else if (format == RATE_MCS_EHT_MSK)
+               break;
+       case RATE_MCS_MOD_TYPE_EHT:
                type = "EHT";
-       else
+               break;
+       default:
                type = "Unknown"; /* shouldn't happen */
+       }
 
-       mcs = format == RATE_MCS_HT_MSK ?
+       mcs = format == RATE_MCS_MOD_TYPE_HT ?
                RATE_HT_MCS_INDEX(rate) :
                rate & RATE_MCS_CODE_MSK;
        nss = u32_get_bits(rate, RATE_MCS_NSS_MSK);
-       sgi = format == RATE_MCS_HE_MSK ?
+       sgi = format == RATE_MCS_MOD_TYPE_HE ?
                iwl_he_is_sgi(rate) :
                rate & RATE_MCS_SGI_MSK;
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mld.h b/drivers/net/wireless/intel/iwlwifi/mld/mld.h
index 7007a43bca4ddb41dc81077a716888e73c61cbfc..0e4cc90fb6fc7389c8e7ea0874cf50e10b9f9319 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/mld.h
+++ b/drivers/net/wireless/intel/iwlwifi/mld/mld.h
@@ -410,7 +410,7 @@ iwl_mld_legacy_hw_idx_to_mac80211_idx(u32 rate_n_flags,
        int rate = rate_n_flags & RATE_LEGACY_RATE_MSK;
        bool is_lb = band == NL80211_BAND_2GHZ;
 
-       if (format == RATE_MCS_LEGACY_OFDM_MSK)
+       if (format == RATE_MCS_MOD_TYPE_LEGACY_OFDM)
                return is_lb ? rate + IWL_FIRST_OFDM_RATE : rate;
 
        /* CCK is not allowed in 5 GHz */

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/rx.c b/drivers/net/wireless/intel/iwlwifi/mld/rx.c
index 307e2bd622e39f5e7d1008a050c349c3332f263f..d95603e6ac78444dda81740c8584ffdbd0a5a2e3 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/rx.c
@@ -1176,7 +1176,7 @@ static void iwl_mld_rx_fill_status(struct iwl_mld *mld, struct sk_buff *skb,
                                      IWL_RX_PHY_DATA1_INFO_TYPE_MASK);
 
        /* set the preamble flag if appropriate */
-       if (format == RATE_MCS_CCK_MSK &&
+       if (format == RATE_MCS_MOD_TYPE_CCK &&
            phy_data->phy_info & IWL_RX_MPDU_PHY_SHORT_PREAMBLE)
                rx_status->enc_flags |= RX_ENC_FLAG_SHORTPRE;
 
@@ -1201,7 +1201,7 @@ static void iwl_mld_rx_fill_status(struct iwl_mld *mld, struct sk_buff *skb,
        }
 
        /* must be before L-SIG data */
-       if (format == RATE_MCS_HE_MSK)
+       if (format == RATE_MCS_MOD_TYPE_HE)
                iwl_mld_rx_he(mld, skb, phy_data, queue);
 
        iwl_mld_decode_lsig(skb, phy_data);
@@ -1209,7 +1209,7 @@ static void iwl_mld_rx_fill_status(struct iwl_mld *mld, struct sk_buff *skb,
        rx_status->device_timestamp = phy_data->gp2_on_air_rise;
 
        /* using TLV format and must be after all fixed len fields */
-       if (format == RATE_MCS_EHT_MSK)
+       if (format == RATE_MCS_MOD_TYPE_EHT)
                iwl_mld_rx_eht(mld, skb, phy_data, queue);
 
 #ifdef CONFIG_IWLWIFI_DEBUGFS
@@ -1217,28 +1217,28 @@ static void iwl_mld_rx_fill_status(struct iwl_mld *mld, struct sk_buff *skb,
                iwl_mld_add_rtap_sniffer_config(mld, skb);
 #endif
 
-       if (format != RATE_MCS_CCK_MSK && is_sgi)
+       if (format != RATE_MCS_MOD_TYPE_CCK && is_sgi)
                rx_status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
 
        if (rate_n_flags & RATE_MCS_LDPC_MSK)
                rx_status->enc_flags |= RX_ENC_FLAG_LDPC;
 
        switch (format) {
-       case RATE_MCS_HT_MSK:
+       case RATE_MCS_MOD_TYPE_HT:
                rx_status->encoding = RX_ENC_HT;
                rx_status->rate_idx = RATE_HT_MCS_INDEX(rate_n_flags);
                rx_status->enc_flags |= stbc << RX_ENC_FLAG_STBC_SHIFT;
                break;
-       case RATE_MCS_VHT_MSK:
-       case RATE_MCS_HE_MSK:
-       case RATE_MCS_EHT_MSK:
-               if (format == RATE_MCS_VHT_MSK) {
+       case RATE_MCS_MOD_TYPE_VHT:
+       case RATE_MCS_MOD_TYPE_HE:
+       case RATE_MCS_MOD_TYPE_EHT:
+               if (format == RATE_MCS_MOD_TYPE_VHT) {
                        rx_status->encoding = RX_ENC_VHT;
-               } else if (format == RATE_MCS_HE_MSK) {
+               } else if (format == RATE_MCS_MOD_TYPE_HE) {
                        rx_status->encoding = RX_ENC_HE;
                        rx_status->he_dcm =
                                !!(rate_n_flags & RATE_HE_DUAL_CARRIER_MODE_MSK);
-               } else if (format == RATE_MCS_EHT_MSK) {
+               } else if (format == RATE_MCS_MOD_TYPE_EHT) {
                        rx_status->encoding = RX_ENC_EHT;
                }
 
@@ -2032,17 +2032,17 @@ void iwl_mld_rx_monitor_no_data(struct iwl_mld *mld, struct napi_struct *napi,
         * may be up to 8 spatial streams.
         */
        switch (format) {
-       case RATE_MCS_VHT_MSK:
+       case RATE_MCS_MOD_TYPE_VHT:
                rx_status->nss =
                        le32_get_bits(desc->rx_vec[0],
                                      RX_NO_DATA_RX_VEC0_VHT_NSTS_MSK) + 1;
                break;
-       case RATE_MCS_HE_MSK:
+       case RATE_MCS_MOD_TYPE_HE:
                rx_status->nss =
                        le32_get_bits(desc->rx_vec[0],
                                      RX_NO_DATA_RX_VEC0_HE_NSTS_MSK) + 1;
                break;
-       case RATE_MCS_EHT_MSK:
+       case RATE_MCS_MOD_TYPE_EHT:
                rx_status->nss =
                        le32_get_bits(desc->rx_vec[2],
                                      RX_NO_DATA_RX_VEC2_EHT_NSTS_MSK) + 1;

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/stats.c b/drivers/net/wireless/intel/iwlwifi/mld/stats.c
index 360a6bfbbfb24d034bb52d44e46ea1bc5f016ed1..f633cb1cf510a7d36eb223b5e09ae7eba45fbca9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/stats.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/stats.c
@@ -191,11 +191,12 @@ static void iwl_mld_sta_stats_fill_txrate(struct iwl_mld_sta *mld_sta,
                break;
        }
 
-       if (format == RATE_MCS_CCK_MSK || format == RATE_MCS_LEGACY_OFDM_MSK) {
+       if (format == RATE_MCS_MOD_TYPE_CCK ||
+           format == RATE_MCS_MOD_TYPE_LEGACY_OFDM) {
                int rate = u32_get_bits(rate_n_flags, RATE_LEGACY_RATE_MSK);
 
                /* add the offset needed to get to the legacy ofdm indices */
-               if (format == RATE_MCS_LEGACY_OFDM_MSK)
+               if (format == RATE_MCS_MOD_TYPE_LEGACY_OFDM)
                        rate += IWL_FIRST_OFDM_RATE;
 
                switch (rate) {
@@ -240,7 +241,7 @@ static void iwl_mld_sta_stats_fill_txrate(struct iwl_mld_sta *mld_sta,
 
        rinfo->nss = u32_get_bits(rate_n_flags, RATE_MCS_NSS_MSK) + 1;
 
-       if (format == RATE_MCS_HT_MSK)
+       if (format == RATE_MCS_MOD_TYPE_HT)
                rinfo->mcs = RATE_HT_MCS_INDEX(rate_n_flags);
        else
                rinfo->mcs = u32_get_bits(rate_n_flags, RATE_MCS_CODE_MSK);
@@ -249,10 +250,10 @@ static void iwl_mld_sta_stats_fill_txrate(struct iwl_mld_sta *mld_sta,
                rinfo->flags |= RATE_INFO_FLAGS_SHORT_GI;
 
        switch (format) {
-       case RATE_MCS_EHT_MSK:
+       case RATE_MCS_MOD_TYPE_EHT:
                rinfo->flags |= RATE_INFO_FLAGS_EHT_MCS;
                break;
-       case RATE_MCS_HE_MSK:
+       case RATE_MCS_MOD_TYPE_HE:
                gi_ltf = u32_get_bits(rate_n_flags, RATE_MCS_HE_GI_LTF_MSK);
 
                rinfo->flags |= RATE_INFO_FLAGS_HE_MCS;
@@ -293,10 +294,10 @@ static void iwl_mld_sta_stats_fill_txrate(struct iwl_mld_sta *mld_sta,
                if (rate_n_flags & RATE_HE_DUAL_CARRIER_MODE_MSK)
                        rinfo->he_dcm = 1;
                break;
-       case RATE_MCS_HT_MSK:
+       case RATE_MCS_MOD_TYPE_HT:
                rinfo->flags |= RATE_INFO_FLAGS_MCS;
                break;
-       case RATE_MCS_VHT_MSK:
+       case RATE_MCS_MOD_TYPE_VHT:
                rinfo->flags |= RATE_INFO_FLAGS_VHT_MCS;
                break;
        }

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tx.c b/drivers/net/wireless/intel/iwlwifi/mld/tx.c
index 208c17d672708eafe5abd1e9823d9015636fa848..a6e312b1edbef6e8a1a27c53ff1b29cfced1ab21 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/tx.c
@@ -391,9 +391,9 @@ static u32 iwl_mld_mac80211_rate_idx_to_fw(struct iwl_mld *mld,
 
        /* Set CCK or OFDM flag */
        if (rate_idx <= IWL_LAST_CCK_RATE)
-               rate_flags |= RATE_MCS_CCK_MSK;
+               rate_flags |= RATE_MCS_MOD_TYPE_CCK;
        else
-               rate_flags |= RATE_MCS_LEGACY_OFDM_MSK;
+               rate_flags |= RATE_MCS_MOD_TYPE_LEGACY_OFDM;
 
        /* Legacy rates are indexed:
         * 0 - 3 for CCK and 0 - 7 for OFDM
@@ -1008,18 +1008,18 @@ static void iwl_mld_hwrate_to_tx_rate(u32 rate_n_flags,
        }
 
        switch (format) {
-       case RATE_MCS_HT_MSK:
+       case RATE_MCS_MOD_TYPE_HT:
                tx_rate->flags |= IEEE80211_TX_RC_MCS;
                tx_rate->idx = RATE_HT_MCS_INDEX(rate_n_flags);
                break;
-       case RATE_MCS_VHT_MSK:
+       case RATE_MCS_MOD_TYPE_VHT:
                ieee80211_rate_set_vht(tx_rate,
                                       rate_n_flags & RATE_MCS_CODE_MSK,
                                       FIELD_GET(RATE_MCS_NSS_MSK,
                                                 rate_n_flags) + 1);
                tx_rate->flags |= IEEE80211_TX_RC_VHT_MCS;
                break;
-       case RATE_MCS_HE_MSK:
+       case RATE_MCS_MOD_TYPE_HE:
                /* mac80211 cannot do this without ieee80211_tx_status_ext()
                 * but it only matters for radiotap
                 */

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index fbd16d61d599c5482225432e36c76eff3526befe..d15031f9f38c4f5367bda58b435c1dc02226c7be 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -6070,12 +6070,12 @@ static void iwl_mvm_set_sta_rate(u32 rate_n_flags, struct rate_info *rinfo)
                break;
        }
 
-       if (format == RATE_MCS_CCK_MSK ||
-           format == RATE_MCS_LEGACY_OFDM_MSK) {
+       if (format == RATE_MCS_MOD_TYPE_CCK ||
+           format == RATE_MCS_MOD_TYPE_LEGACY_OFDM) {
                int rate = u32_get_bits(rate_n_flags, RATE_LEGACY_RATE_MSK);
 
                /* add the offset needed to get to the legacy ofdm indices */
-               if (format == RATE_MCS_LEGACY_OFDM_MSK)
+               if (format == RATE_MCS_MOD_TYPE_LEGACY_OFDM)
                        rate += IWL_FIRST_OFDM_RATE;
 
                switch (rate) {
@@ -6120,7 +6120,7 @@ static void iwl_mvm_set_sta_rate(u32 rate_n_flags, struct rate_info *rinfo)
 
        rinfo->nss = u32_get_bits(rate_n_flags,
                                  RATE_MCS_NSS_MSK) + 1;
-       rinfo->mcs = format == RATE_MCS_HT_MSK ?
+       rinfo->mcs = format == RATE_MCS_MOD_TYPE_HT ?
                RATE_HT_MCS_INDEX(rate_n_flags) :
                u32_get_bits(rate_n_flags, RATE_MCS_CODE_MSK);
 
@@ -6128,11 +6128,11 @@ static void iwl_mvm_set_sta_rate(u32 rate_n_flags, struct rate_info *rinfo)
                rinfo->flags |= RATE_INFO_FLAGS_SHORT_GI;
 
        switch (format) {
-       case RATE_MCS_EHT_MSK:
+       case RATE_MCS_MOD_TYPE_EHT:
                /* TODO: GI/LTF/RU. How does the firmware encode them? */
                rinfo->flags |= RATE_INFO_FLAGS_EHT_MCS;
                break;
-       case RATE_MCS_HE_MSK:
+       case RATE_MCS_MOD_TYPE_HE:
                gi_ltf = u32_get_bits(rate_n_flags, RATE_MCS_HE_GI_LTF_MSK);
 
                rinfo->flags |= RATE_INFO_FLAGS_HE_MCS;
@@ -6173,10 +6173,10 @@ static void iwl_mvm_set_sta_rate(u32 rate_n_flags, struct rate_info *rinfo)
                if (rate_n_flags & RATE_HE_DUAL_CARRIER_MODE_MSK)
                        rinfo->he_dcm = 1;
                break;
-       case RATE_MCS_HT_MSK:
+       case RATE_MCS_MOD_TYPE_HT:
                rinfo->flags |= RATE_INFO_FLAGS_MCS;
                break;
-       case RATE_MCS_VHT_MSK:
+       case RATE_MCS_MOD_TYPE_VHT:
                rinfo->flags |= RATE_INFO_FLAGS_VHT_MCS;
                break;
        }

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
index 358643ae0e4207376af27ce1f4a08c21f6c255da..1cc35c82c392063ebe054d5c211ae790f73a8b0e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@ -1944,7 +1944,7 @@ static void iwl_mvm_rx_fill_status(struct iwl_mvm *mvm,
        }
 
        /* must be before L-SIG data */
-       if (format == RATE_MCS_HE_MSK)
+       if (format == RATE_MCS_MOD_TYPE_HE)
                iwl_mvm_rx_he(mvm, skb, phy_data, queue);
 
        iwl_mvm_decode_lsig(skb, phy_data);
@@ -1966,45 +1966,45 @@ static void iwl_mvm_rx_fill_status(struct iwl_mvm *mvm,
                                    phy_data->energy_a, phy_data->energy_b);
 
        /* using TLV format and must be after all fixed len fields */
-       if (format == RATE_MCS_EHT_MSK)
+       if (format == RATE_MCS_MOD_TYPE_EHT)
                iwl_mvm_rx_eht(mvm, skb, phy_data, queue);
 
        if (unlikely(mvm->monitor_on))
                iwl_mvm_add_rtap_sniffer_config(mvm, skb);
 
-       is_sgi = format == RATE_MCS_HE_MSK ?
+       is_sgi = format == RATE_MCS_MOD_TYPE_HE ?
                iwl_he_is_sgi(rate_n_flags) :
                rate_n_flags & RATE_MCS_SGI_MSK;
 
-       if (!(format == RATE_MCS_CCK_MSK) && is_sgi)
+       if (!(format == RATE_MCS_MOD_TYPE_CCK) && is_sgi)
                rx_status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
 
        if (rate_n_flags & RATE_MCS_LDPC_MSK)
                rx_status->enc_flags |= RX_ENC_FLAG_LDPC;
 
        switch (format) {
-       case RATE_MCS_VHT_MSK:
+       case RATE_MCS_MOD_TYPE_VHT:
                rx_status->encoding = RX_ENC_VHT;
                break;
-       case RATE_MCS_HE_MSK:
+       case RATE_MCS_MOD_TYPE_HE:
                rx_status->encoding = RX_ENC_HE;
                rx_status->he_dcm =
                        !!(rate_n_flags & RATE_HE_DUAL_CARRIER_MODE_MSK);
                break;
-       case RATE_MCS_EHT_MSK:
+       case RATE_MCS_MOD_TYPE_EHT:
                rx_status->encoding = RX_ENC_EHT;
                break;
        }
 
        switch (format) {
-       case RATE_MCS_HT_MSK:
+       case RATE_MCS_MOD_TYPE_HT:
                rx_status->encoding = RX_ENC_HT;
                rx_status->rate_idx = RATE_HT_MCS_INDEX(rate_n_flags);
                rx_status->enc_flags |= stbc << RX_ENC_FLAG_STBC_SHIFT;
                break;
-       case RATE_MCS_VHT_MSK:
-       case RATE_MCS_HE_MSK:
-       case RATE_MCS_EHT_MSK:
+       case RATE_MCS_MOD_TYPE_VHT:
+       case RATE_MCS_MOD_TYPE_HE:
+       case RATE_MCS_MOD_TYPE_EHT:
                rx_status->nss =
                        u32_get_bits(rate_n_flags, RATE_MCS_NSS_MSK) + 1;
                rx_status->rate_idx = rate_n_flags & RATE_MCS_CODE_MSK;
@@ -2138,7 +2138,7 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,
        }
 
        /* set the preamble flag if appropriate */
-       if (format == RATE_MCS_CCK_MSK &&
+       if (format == RATE_MCS_MOD_TYPE_CCK &&
            phy_data.phy_info & IWL_RX_MPDU_PHY_SHORT_PREAMBLE)
                rx_status->enc_flags |= RX_ENC_FLAG_SHORTPRE;
 
@@ -2412,7 +2412,7 @@ void iwl_mvm_rx_monitor_no_data(struct iwl_mvm *mvm, struct napi_struct *napi,
                phy_data.rx_vec[2] = desc->rx_vec[2];
                phy_data.rx_vec[3] = desc->rx_vec[3];
        } else {
-               if (format == RATE_MCS_EHT_MSK)
+               if (format == RATE_MCS_MOD_TYPE_EHT)
                        /* no support for EHT before version 3 API */
                        return;
        }
@@ -2473,17 +2473,17 @@ void iwl_mvm_rx_monitor_no_data(struct iwl_mvm *mvm, struct napi_struct *napi,
         * may be up to 8 spatial streams.
         */
        switch (format) {
-       case RATE_MCS_VHT_MSK:
+       case RATE_MCS_MOD_TYPE_VHT:
                rx_status->nss =
                        le32_get_bits(desc->rx_vec[0],
                                      RX_NO_DATA_RX_VEC0_VHT_NSTS_MSK) + 1;
                break;
-       case RATE_MCS_HE_MSK:
+       case RATE_MCS_MOD_TYPE_HE:
                rx_status->nss =
                        le32_get_bits(desc->rx_vec[0],
                                      RX_NO_DATA_RX_VEC0_HE_NSTS_MSK) + 1;
                break;
-       case RATE_MCS_EHT_MSK:
+       case RATE_MCS_MOD_TYPE_EHT:
                rx_status->nss =
                        le32_get_bits(desc->rx_vec[2],
                                      RX_NO_DATA_RX_VEC2_EHT_NSTS_MSK) + 1;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index 14f9daad4757f2205d2888c9694bfe02e0943fa1..ee4b5cfc57d3eb1523fb3a174d2881e2f16e59ba 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -285,9 +285,9 @@ static u32 iwl_mvm_convert_rate_idx(struct iwl_mvm *mvm,
        /* Set CCK or OFDM flag */
        if (iwl_fw_lookup_cmd_ver(mvm->fw, TX_CMD, 0) > 8) {
                if (!is_cck)
-                       rate_flags |= RATE_MCS_LEGACY_OFDM_MSK;
+                       rate_flags |= RATE_MCS_MOD_TYPE_LEGACY_OFDM;
                else
-                       rate_flags |= RATE_MCS_CCK_MSK;
+                       rate_flags |= RATE_MCS_MOD_TYPE_CCK;
        } else if (is_cck) {
                rate_flags |= RATE_MCS_CCK_MSK_V1;
        }
@@ -1467,7 +1467,7 @@ void iwl_mvm_hwrate_to_tx_rate(u32 rate_n_flags,
                               struct ieee80211_tx_rate *r)
 {
        u32 format = rate_n_flags & RATE_MCS_MOD_TYPE_MSK;
-       u32 rate = format == RATE_MCS_HT_MSK ?
+       u32 rate = format == RATE_MCS_MOD_TYPE_HT ?
                RATE_HT_MCS_INDEX(rate_n_flags) :
                rate_n_flags & RATE_MCS_CODE_MSK;
 
@@ -1477,19 +1477,23 @@ void iwl_mvm_hwrate_to_tx_rate(u32 rate_n_flags,
 
        if (rate_n_flags & RATE_MCS_SGI_MSK)
                r->flags |= IEEE80211_TX_RC_SHORT_GI;
-       if (format ==  RATE_MCS_HT_MSK) {
+       switch (format) {
+       case RATE_MCS_MOD_TYPE_HT:
                r->flags |= IEEE80211_TX_RC_MCS;
                r->idx = rate;
-       } else if (format ==  RATE_MCS_VHT_MSK) {
+               break;
+       case RATE_MCS_MOD_TYPE_VHT:
                ieee80211_rate_set_vht(r, rate,
                                       FIELD_GET(RATE_MCS_NSS_MSK,
                                                 rate_n_flags) + 1);
                r->flags |= IEEE80211_TX_RC_VHT_MCS;
-       } else if (format == RATE_MCS_HE_MSK) {
+               break;
+       case RATE_MCS_MOD_TYPE_HE:
                /* mac80211 cannot do this without ieee80211_tx_status_ext()
                 * but it only matters for radiotap */
                r->idx = 0;
-       } else {
+               break;
+       default:
                r->idx = iwl_mvm_legacy_hw_idx_to_mac80211_idx(rate_n_flags,
                                                               band);
        }

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
index dd890dcd1505f706567719624613476207bb133c..33be79e8cd1e5c0406570c2fd872f35327a12ec9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /*
- * Copyright (C) 2012-2014, 2018-2024 Intel Corporation
+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation
  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH
  * Copyright (C) 2015-2017 Intel Deutschland GmbH
  */
@@ -142,7 +142,7 @@ int iwl_mvm_legacy_hw_idx_to_mac80211_idx(u32 rate_n_flags,
        int rate = rate_n_flags & RATE_LEGACY_RATE_MSK;
        bool is_LB = band == NL80211_BAND_2GHZ;
 
-       if (format == RATE_MCS_LEGACY_OFDM_MSK)
+       if (format == RATE_MCS_MOD_TYPE_LEGACY_OFDM)
                return is_LB ? rate + IWL_FIRST_OFDM_RATE :
                        rate;