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

[cascardo/linux.git] / drivers / net / wireless / rtlwifi / rtl8192ce / sw.c

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
index 46ea076..de6cb6c 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
@@ -228,6 +228,7 @@ static struct rtl_hal_ops rtl8192ce_hal_ops = {
        .led_control = rtl92ce_led_control,
        .set_desc = rtl92ce_set_desc,
        .get_desc = rtl92ce_get_desc,
+       .is_tx_desc_closed = rtl92ce_is_tx_desc_closed,
        .tx_polling = rtl92ce_tx_polling,
        .enable_hw_sec = rtl92ce_enable_hw_security_config,
        .set_key = rtl92ce_set_key,
@@ -271,6 +272,8 @@ static struct rtl_hal_cfg rtl92ce_hal_cfg = {
        .maps[MAC_RCR_ACRC32] = ACRC32,
        .maps[MAC_RCR_ACF] = ACF,
        .maps[MAC_RCR_AAP] = AAP,
+       .maps[MAC_HIMR] = REG_HIMR,
+       .maps[MAC_HIMRE] = REG_HIMRE,
 
        .maps[EFUSE_TEST] = REG_EFUSE_TEST,
        .maps[EFUSE_CTRL] = REG_EFUSE_CTRL,
@@ -331,21 +334,21 @@ static struct rtl_hal_cfg rtl92ce_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,
 };
 
 static const struct pci_device_id rtl92ce_pci_ids[] = {