rtlwifi: Convert all drivers to use a common set of rate descriptors

This common set of rate descriptors is renamed to be DESC_RATExx.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

3 files changed, 19 insertions, 19 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
index c2d8ec6afcda..133e395b7401 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
@@ -880,8 +880,8 @@ static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw,
                 pstats->rxpower = rx_pwr_all;
                 pstats->recvsignalpower = rx_pwr_all;
                 if (GET_RX_DESC_RX_MCS(pdesc) &&
-                    GET_RX_DESC_RX_MCS(pdesc) >= DESC92_RATEMCS8 &&
-                    GET_RX_DESC_RX_MCS(pdesc) <= DESC92_RATEMCS15)
+                    GET_RX_DESC_RX_MCS(pdesc) >= DESC_RATEMCS8 &&
+                    GET_RX_DESC_RX_MCS(pdesc) <= DESC_RATEMCS15)
                         max_spatial_stream = 2;
                 else
                         max_spatial_stream = 1;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index e06bafee37f9..90a714c189a8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@ -257,20 +257,20 @@ static struct rtl_hal_cfg rtl92cu_hal_cfg = {
         .maps[RTL_IMR_ROK] = IMR_ROK,
         .maps[RTL_IBSS_INT_MASKS] = (IMR_BCNINT | IMR_TBDOK | IMR_TBDER),
 
-        .maps[RTL_RC_CCK_RATE1M] = DESC92_RATE1M,
-        .maps[RTL_RC_CCK_RATE2M] = DESC92_RATE2M,
-        .maps[RTL_RC_CCK_RATE5_5M] = DESC92_RATE5_5M,
-        .maps[RTL_RC_CCK_RATE11M] = DESC92_RATE11M,
-        .maps[RTL_RC_OFDM_RATE6M] = DESC92_RATE6M,
-        .maps[RTL_RC_OFDM_RATE9M] = DESC92_RATE9M,
-        .maps[RTL_RC_OFDM_RATE12M] = DESC92_RATE12M,
-        .maps[RTL_RC_OFDM_RATE18M] = DESC92_RATE18M,
-        .maps[RTL_RC_OFDM_RATE24M] = DESC92_RATE24M,
-        .maps[RTL_RC_OFDM_RATE36M] = DESC92_RATE36M,
-        .maps[RTL_RC_OFDM_RATE48M] = DESC92_RATE48M,
-        .maps[RTL_RC_OFDM_RATE54M] = DESC92_RATE54M,
-        .maps[RTL_RC_HT_RATEMCS7] = DESC92_RATEMCS7,
-        .maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15,
+        .maps[RTL_RC_CCK_RATE1M] = DESC_RATE1M,
+        .maps[RTL_RC_CCK_RATE2M] = DESC_RATE2M,
+        .maps[RTL_RC_CCK_RATE5_5M] = DESC_RATE5_5M,
+        .maps[RTL_RC_CCK_RATE11M] = DESC_RATE11M,
+        .maps[RTL_RC_OFDM_RATE6M] = DESC_RATE6M,
+        .maps[RTL_RC_OFDM_RATE9M] = DESC_RATE9M,
+        .maps[RTL_RC_OFDM_RATE12M] = DESC_RATE12M,
+        .maps[RTL_RC_OFDM_RATE18M] = DESC_RATE18M,
+        .maps[RTL_RC_OFDM_RATE24M] = DESC_RATE24M,
+        .maps[RTL_RC_OFDM_RATE36M] = DESC_RATE36M,
+        .maps[RTL_RC_OFDM_RATE48M] = DESC_RATE48M,
+        .maps[RTL_RC_OFDM_RATE54M] = DESC_RATE54M,
+        .maps[RTL_RC_HT_RATEMCS7] = DESC_RATEMCS7,
+        .maps[RTL_RC_HT_RATEMCS15] = DESC_RATEMCS15,
 };
 
 #define USB_VENDER_ID_REALTEK           0x0bda
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index fa30b260e5ba..fe298766ea88 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -543,7 +543,7 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
         SET_TX_DESC_RTS_BW(txdesc, 0);
         SET_TX_DESC_RTS_SC(txdesc, tcb_desc->rts_sc);
         SET_TX_DESC_RTS_SHORT(txdesc,
-                              ((tcb_desc->rts_rate <= DESC92_RATE54M) ?
+                              ((tcb_desc->rts_rate <= DESC_RATE54M) ?
                                (tcb_desc->rts_use_shortpreamble ? 1 : 0)
                                : (tcb_desc->rts_use_shortgi ? 1 : 0)));
         if (mac->bw_40) {
@@ -642,7 +642,7 @@ void rtl92cu_fill_fake_txdesc(struct ieee80211_hw *hw, u8 * pDesc,
         }
         SET_TX_DESC_USE_RATE(pDesc, 1); /* use data rate which is set by Sw */
         SET_TX_DESC_OWN(pDesc, 1);
-        SET_TX_DESC_TX_RATE(pDesc, DESC92_RATE1M);
+        SET_TX_DESC_TX_RATE(pDesc, DESC_RATE1M);
         _rtl_tx_desc_checksum(pDesc);
 }
 
@@ -658,7 +658,7 @@ void rtl92cu_tx_fill_cmddesc(struct ieee80211_hw *hw,
         memset((void *)pdesc, 0, RTL_TX_HEADER_SIZE);
         if (firstseg)
                 SET_TX_DESC_OFFSET(pdesc, RTL_TX_HEADER_SIZE);
-        SET_TX_DESC_TX_RATE(pdesc, DESC92_RATE1M);
+        SET_TX_DESC_TX_RATE(pdesc, DESC_RATE1M);
         SET_TX_DESC_SEQ(pdesc, 0);
         SET_TX_DESC_LINIP(pdesc, 0);
         SET_TX_DESC_QUEUE_SEL(pdesc, fw_queue);