staging: rtl8723au: Make direct calls for HW_VAR_TXDMA_AGG_PG_TH

This was in fact turned into a no-op for the RTL8723AU, but it looks
like a bug, so this reenables it.

Keep an eye out for side-effects here and revert this, if it causes
issues.

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_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index 6cee78785bdc671e09c14829002f958e5c63a6fe..9cf26ea0088b4754a833249c089212de2a0ff891 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -2193,13 +2193,10 @@ void rtw_joinbss_reset23a(struct rtw_adapter *padapter)
                        threshold = 1;
                else
                        threshold = 0;
-               rtw_hal_set_hwreg23a(padapter, HW_VAR_RXDMA_AGG_PG_TH,
-                                 (u8 *)(&threshold));
-       } else {
+       } else
                threshold = 1;
-               rtw_hal_set_hwreg23a(padapter, HW_VAR_RXDMA_AGG_PG_TH,
-                                 (u8 *)(&threshold));
-       }
+
+       rtl8723a_set_rxdma_agg_pg_th(padapter, threshold);
 }
 
 /* the fucntion is >= passive_level */

diff --git a/drivers/staging/rtl8723au/core/rtw_sreset.c b/drivers/staging/rtl8723au/core/rtw_sreset.c
index e243a3afcdcd51e2d8c55936857afdd323a45dcf..dd2a6f18f7d700c88f98858b14f695d4f5027ed1 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_sreset.c
+++ b/drivers/staging/rtl8723au/core/rtw_sreset.c
@@ -132,13 +132,13 @@ static void sreset_restore_network_station(struct rtw_adapter *padapter)
                        threshold = 1;
                else
                        threshold = 0;
-               rtw_hal_set_hwreg23a(padapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold));
-       } else {
+       } else
                threshold = 1;
-               rtw_hal_set_hwreg23a(padapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold));
-       }
 
-       set_channel_bwmode23a(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode);
+       rtl8723a_set_rxdma_agg_pg_th(padapter, threshold);
+
+       set_channel_bwmode23a(padapter, pmlmeext->cur_channel,
+                             pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode);
 
        /* disable dynamic functions, such as high power, DIG */
        /* Switch_DM_Func23a(padapter, DYNAMIC_FUNC_DISABLE, false); */

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index e6e501217e6db09f67500b3902d17dbbd4b0aa25..fee79d1a190aad89bcd84ba36040462d2b2f14eb 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -3153,10 +3153,6 @@ void SetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val)
                rtl8723a_odm_support_ability_clr(padapter, *val32);
                break;
 
-       case HW_VAR_RXDMA_AGG_PG_TH:
-               rtl8723a_set_rxdma_agg_pg_th(padapter, *val);
-               break;
-
        case HW_VAR_H2C_FW_PWRMODE:
                rtl8723a_set_FwPwrMode_cmd(padapter, *val);
                break;

diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c
index eae95ec38516eabdfb47462a3ae6a7bd250cf6f7..2b44b17acc705bd24cf8a999d61281cdab6cd2b7 100644 (file)
--- a/drivers/staging/rtl8723au/hal/usb_halinit.c
+++ b/drivers/staging/rtl8723au/hal/usb_halinit.c
@@ -1519,8 +1519,6 @@ static void rtl8723au_trigger_gpio_0(struct rtw_adapter *padapter)
 static void SetHwReg8723AU(struct rtw_adapter *Adapter, u8 variable, u8 *val)
 {
        switch (variable) {
-       case HW_VAR_RXDMA_AGG_PG_TH:
-               break;
        case HW_VAR_SET_RPWM:
                rtl8723a_set_rpwm(Adapter, *val);
                break;

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index fcb441154b312b204728a66a4828f18d63d076e9..e2b9fdcb219202e068e9cbc5730fb7d3715df7cc 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -44,7 +44,6 @@ enum HW_VARIABLES {
        HW_VAR_DM_FUNC_SET,
        HW_VAR_DM_FUNC_CLR,
        HW_VAR_CAM_READ,
-       HW_VAR_RXDMA_AGG_PG_TH,
        HW_VAR_SET_RPWM,
        HW_VAR_H2C_FW_PWRMODE,
        HW_VAR_H2C_FW_JOINBSSRPT,