staging: rtl8723au: Eliminate usage of HW_VAR_BASIC_RATE

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_ap.c b/drivers/staging/rtl8723au/core/rtw_ap.c
index a357e98cb83e02a54e3182e3d4fe5cece5f54e4c..95311bd8fe76cafaed6c01afea35c5d60517a34b 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_ap.c
+++ b/drivers/staging/rtl8723au/core/rtw_ap.c
@@ -715,7 +715,7 @@ static void start_bss_network(struct rtw_adapter *padapter, u8 *pbuf)
        rtw_hal_set_hwreg23a(padapter, HW_VAR_BEACON_INTERVAL, (u8 *)(&bcn_interval));
 
        UpdateBrateTbl23a(padapter, pnetwork->SupportedRates);
-       rtw_hal_set_hwreg23a(padapter, HW_VAR_BASIC_RATE, pnetwork->SupportedRates);
+       HalSetBrateCfg23a(padapter, pnetwork->SupportedRates);
 
        if (!pmlmepriv->cur_network.join_res) {
                /* setting only at  first time */

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
index d91e88e0f955df16fd8fde181e1f7e3baecd2381..36b8a732824a7955819d6b494a38c78b79b050de 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
@@ -8724,7 +8724,7 @@ void mlmeext_joinbss_event_callback23a(struct rtw_adapter *padapter, int join_re
        /*  update IOT-releated issue */
        update_IOT_info23a(padapter);
 
-       rtw_hal_set_hwreg23a(padapter, HW_VAR_BASIC_RATE, cur_network->SupportedRates);
+       HalSetBrateCfg23a(padapter, cur_network->SupportedRates);
 
        /* BCN interval */
        rtw_hal_set_hwreg23a(padapter, HW_VAR_BEACON_INTERVAL, (u8 *)(&pmlmeinfo->bcn_interval));

diff --git a/drivers/staging/rtl8723au/core/rtw_wlan_util.c b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
index 0114c46c36a1198b59bfa0b84f10f61697be646d..8f1bd0708a138c443c5ba59b338b12609fd8c1b0 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
@@ -1452,7 +1452,7 @@ void update_tx_basic_rate23a(struct rtw_adapter *padapter, u8 wirelessmode)
        else
                update_mgnt_tx_rate23a(padapter, IEEE80211_OFDM_RATE_6MB);
 
-       rtw_hal_set_hwreg23a(padapter, HW_VAR_BASIC_RATE, supported_rates);
+       HalSetBrateCfg23a(padapter, supported_rates);
 }
 
 unsigned char check_assoc_AP23a(u8 *pframe, uint len)

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
index 9d738d79de4bb748020ead68b563dc1510b22b92..e4496c840b4d2cccd4cf3e8e431b6b0c774df06c 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
@@ -4677,7 +4677,7 @@ bthci_StateConnected(struct rtw_adapter *padapter,
                if (padapter->HalFunc.UpdateRAMaskHandler)
                        padapter->HalFunc.UpdateRAMaskHandler(padapter, MAX_FW_SUPPORT_MACID_NUM-1-EntryNum, 0);
 
-               rtw_hal_set_hwreg23a(padapter, HW_VAR_BASIC_RATE, padapter->mlmepriv.cur_network.network.SupportedRates);
+               HalSetBrateCfg23a(padapter, padapter->mlmepriv.cur_network.network.SupportedRates);
                BTDM_SetFwChnlInfo(padapter, RT_MEDIA_CONNECT);
                break;
        default:

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index eebd01cea1388b086a0d63e94a7cb465f5afa12b..b66ab21d00734a0eb4544ea17e32bc3fe43ef755 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -3143,10 +3143,6 @@ void SetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val)
                hw_var_set_bssid(padapter, val);
                break;
 
-       case HW_VAR_BASIC_RATE:
-               HalSetBrateCfg23a(padapter, val);
-               break;
-
        case HW_VAR_TXPAUSE:
                rtl8723a_set_tx_pause(padapter, *val);
                break;
@@ -3285,10 +3281,6 @@ void GetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val)
        struct hal_data_8723a *pHalData = GET_HAL_DATA(padapter);
 
        switch (variable) {
-       case HW_VAR_BASIC_RATE:
-               *((u16 *) val) = pHalData->BasicRateSet;
-               break;
-
        case HW_VAR_TXPAUSE:
                *val = rtw_read8(padapter, REG_TXPAUSE);
                break;

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index ee3315ec7d77929a2c9f9ab90ac52d1b3b9725f5..7e6cb41a8355ae1c6c10d12c5c21ba1455d2c633 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -39,7 +39,6 @@ enum HW_VARIABLES {
        HW_VAR_MAC_ADDR,
        HW_VAR_BSSID,
        HW_VAR_INIT_RTS_RATE,
-       HW_VAR_BASIC_RATE,
        HW_VAR_TXPAUSE,
        HW_VAR_BCN_FUNC,
        HW_VAR_CHECK_BSSID,