staging: rtl8723au: Eliminate HW_VAR_BEACON_INTERVAL

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 5b89c206928e950d68e1aefc1b0ab1919fd24f71..888901aa9b13ccdbf5803f31d17677e5dbc54e19 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_ap.c
+++ b/drivers/staging/rtl8723au/core/rtw_ap.c
@@ -712,7 +712,7 @@ static void start_bss_network(struct rtw_adapter *padapter, u8 *pbuf)
        rtw_hal_set_hwreg23a(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8));
 
        /* Beacon Control related register */
-       rtw_hal_set_hwreg23a(padapter, HW_VAR_BEACON_INTERVAL, (u8 *)(&bcn_interval));
+       rtl8723a_set_beacon_interval(padapter, bcn_interval);
 
        UpdateBrateTbl23a(padapter, pnetwork->SupportedRates);
        HalSetBrateCfg23a(padapter, pnetwork->SupportedRates);

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
index bed8829b00bdb4fbe349ee04805a798b7d93dd2f..90efa4738d96df4ea77e8fe6788e11cb3cdea4bc 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
@@ -8722,7 +8722,7 @@ void mlmeext_joinbss_event_callback23a(struct rtw_adapter *padapter, int join_re
        HalSetBrateCfg23a(padapter, cur_network->SupportedRates);
 
        /* BCN interval */
-       rtw_hal_set_hwreg23a(padapter, HW_VAR_BEACON_INTERVAL, (u8 *)(&pmlmeinfo->bcn_interval));
+       rtl8723a_set_beacon_interval(padapter, pmlmeinfo->bcn_interval);
 
        /* udpate capability */
        update_capinfo23a(padapter, pmlmeinfo->capability);

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index ac64815861aa877ecb4f2cd2597c560aeccc16e5..8931626a694640f8a94cda44096cfc06781546f0 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)
                rtl8723a_set_bcn_func(padapter, *val);
                break;
 
-       case HW_VAR_BEACON_INTERVAL:
-               rtl8723a_set_beacon_interval(padapter, *((u16 *) val));
-               break;
-
        case HW_VAR_SLOT_TIME:
                rtl8723a_set_slot_time(padapter, *val);
                break;

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index 2ca5713b0232221b9ab519b270ca522628c2f9c9..395660193c818454a0e13ec969a5fe0de3084eec 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_INIT_RTS_RATE,
        HW_VAR_TXPAUSE,
        HW_VAR_BCN_FUNC,
-       HW_VAR_BEACON_INTERVAL,
        HW_VAR_SLOT_TIME,
        HW_VAR_RESP_SIFS,
        HW_VAR_ACK_PREAMBLE,