rtlwifi: Prepare existing drivers for new driver

A driver for the RTL8723BE will soon be added. This patch adds the
necessary parts to the common headers, and modifies the existing
drivers for those changes.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 14 insertions, 20 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
index 4680816f9597..914b36f72d55 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
@@ -306,7 +306,7 @@ void rtl8723ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 u8 e_aci = *((u8 *) val);
                 rtl8723ae_dm_init_edca_turbo(hw);
 
-                if (rtlpci->acm_method != eAcmWay2_SW)
+                if (rtlpci->acm_method != EACMWAY2_SW)
                         rtlpriv->cfg->ops->set_hw_reg(hw,
                                                       HW_VAR_ACM_CTRL,
                                                       (u8 *) (&e_aci));
@@ -1656,7 +1656,7 @@ static void _rtl8723ae_read_adapter_info(struct ieee80211_hw *hw,
                                     CHK_SVID_SMID(0x10EC, 0x9185))
                                         rtlhal->oem_id = RT_CID_TOSHIBA;
                                 else if (rtlefuse->eeprom_svid == 0x1025)
-                                        rtlhal->oem_id = RT_CID_819x_Acer;
+                                        rtlhal->oem_id = RT_CID_819X_ACER;
                                 else if (CHK_SVID_SMID(0x10EC, 0x6191) ||
                                          CHK_SVID_SMID(0x10EC, 0x6192) ||
                                          CHK_SVID_SMID(0x10EC, 0x6193) ||
@@ -1666,7 +1666,7 @@ static void _rtl8723ae_read_adapter_info(struct ieee80211_hw *hw,
                                          CHK_SVID_SMID(0x10EC, 0x8191) ||
                                          CHK_SVID_SMID(0x10EC, 0x8192) ||
                                          CHK_SVID_SMID(0x10EC, 0x8193))
-                                        rtlhal->oem_id = RT_CID_819x_SAMSUNG;
+                                        rtlhal->oem_id = RT_CID_819X_SAMSUNG;
                                 else if (CHK_SVID_SMID(0x10EC, 0x8195) ||
                                          CHK_SVID_SMID(0x10EC, 0x9195) ||
                                          CHK_SVID_SMID(0x10EC, 0x7194) ||
@@ -1674,24 +1674,24 @@ static void _rtl8723ae_read_adapter_info(struct ieee80211_hw *hw,
                                          CHK_SVID_SMID(0x10EC, 0x8201) ||
                                          CHK_SVID_SMID(0x10EC, 0x8202) ||
                                          CHK_SVID_SMID(0x10EC, 0x9200))
-                                        rtlhal->oem_id = RT_CID_819x_Lenovo;
+                                        rtlhal->oem_id = RT_CID_819X_LENOVO;
                                 else if (CHK_SVID_SMID(0x10EC, 0x8197) ||
                                          CHK_SVID_SMID(0x10EC, 0x9196))
-                                        rtlhal->oem_id = RT_CID_819x_CLEVO;
+                                        rtlhal->oem_id = RT_CID_819X_CLEVO;
                                 else if (CHK_SVID_SMID(0x1028, 0x8194) ||
                                          CHK_SVID_SMID(0x1028, 0x8198) ||
                                          CHK_SVID_SMID(0x1028, 0x9197) ||
                                          CHK_SVID_SMID(0x1028, 0x9198))
-                                        rtlhal->oem_id = RT_CID_819x_DELL;
+                                        rtlhal->oem_id = RT_CID_819X_DELL;
                                 else if (CHK_SVID_SMID(0x103C, 0x1629))
-                                        rtlhal->oem_id = RT_CID_819x_HP;
+                                        rtlhal->oem_id = RT_CID_819X_HP;
                                 else if (CHK_SVID_SMID(0x1A32, 0x2315))
-                                        rtlhal->oem_id = RT_CID_819x_QMI;
+                                        rtlhal->oem_id = RT_CID_819X_QMI;
                                 else if (CHK_SVID_SMID(0x10EC, 0x8203))
-                                        rtlhal->oem_id = RT_CID_819x_PRONETS;
+                                        rtlhal->oem_id = RT_CID_819X_PRONETS;
                                 else if (CHK_SVID_SMID(0x1043, 0x84B5))
                                         rtlhal->oem_id =
-                                                 RT_CID_819x_Edimax_ASUS;
+                                                 RT_CID_819X_EDIMAX_ASUS;
                                 else
                                         rtlhal->oem_id = RT_CID_DEFAULT;
                         } else if (rtlefuse->eeprom_did == 0x8178) {
@@ -1713,12 +1713,12 @@ static void _rtl8723ae_read_adapter_info(struct ieee80211_hw *hw,
                                     CHK_SVID_SMID(0x10EC, 0x9185))
                                         rtlhal->oem_id = RT_CID_TOSHIBA;
                                 else if (rtlefuse->eeprom_svid == 0x1025)
-                                        rtlhal->oem_id = RT_CID_819x_Acer;
+                                        rtlhal->oem_id = RT_CID_819X_ACER;
                                 else if (CHK_SVID_SMID(0x10EC, 0x8186))
-                                        rtlhal->oem_id = RT_CID_819x_PRONETS;
+                                        rtlhal->oem_id = RT_CID_819X_PRONETS;
                                 else if (CHK_SVID_SMID(0x1043, 0x8486))
                                         rtlhal->oem_id =
-                                                     RT_CID_819x_Edimax_ASUS;
+                                                     RT_CID_819X_EDIMAX_ASUS;
                                 else
                                         rtlhal->oem_id = RT_CID_DEFAULT;
                         } else {
@@ -1732,7 +1732,7 @@ static void _rtl8723ae_read_adapter_info(struct ieee80211_hw *hw,
                         rtlhal->oem_id = RT_CID_CCX;
                         break;
                 case EEPROM_CID_QMI:
-                        rtlhal->oem_id = RT_CID_819x_QMI;
+                        rtlhal->oem_id = RT_CID_819X_QMI;
                         break;
                 case EEPROM_CID_WHQL:
                                 break;
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.h b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.h
index ad05b54bc0f1..c75bfe8d570c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.h
@@ -521,12 +521,6 @@ do {							\
                 memset(__pdesc, 0, _size);              \
 } while (0)
 
-#define RTL8723E_RX_HAL_IS_CCK_RATE(rxmcs)              \
-        ((rxmcs) == DESC92_RATE1M ||                    \
-         (rxmcs) == DESC92_RATE2M ||                    \
-         (rxmcs) == DESC92_RATE5_5M ||                  \
-         (rxmcs) == DESC92_RATE11M)
-
 struct rx_fwinfo_8723e {
         u8 gain_trsw[4];
         u8 pwdb_all;