staging: rtl8723au: Eliminate HW_VAR_RESP_SIFS

Yet another case of an endian bug from treating a 32 bit integer as an
array of 8 bit numbers...

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_wlan_util.c b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
index 183b2665abdd73a257b0d64f126ffc2c44c4ec69..ab9d98d5fc7eee58dab00c0abe360f61a2e2d025 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
@@ -1606,7 +1606,6 @@ void update_capinfo23a(struct rtw_adapter *Adapter, u16 updateCap)
 void update_wireless_mode23a(struct rtw_adapter *padapter)
 {
        int ratelen, network_type = 0;
-       u32 SIFS_Timer;
        struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
        struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
        struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;
@@ -1635,10 +1634,9 @@ void update_wireless_mode23a(struct rtw_adapter *padapter)
 
        pmlmeext->cur_wireless_mode = network_type & padapter->registrypriv.wireless_mode;
 
-       SIFS_Timer = 0x0a0a0808; /* 0x0808 -> for CCK, 0x0a0a -> for OFDM */
-                             /* change this value if having IOT issues. */
-
-       padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_RESP_SIFS,  (u8 *)&SIFS_Timer);
+       /* 0x0808 -> for CCK, 0x0a0a -> for OFDM */
+       /* change this value if having IOT issues. */
+       rtl8723a_set_resp_sifs(padapter, 0x08, 0x08, 0x0a, 0x0a);
 
        if (pmlmeext->cur_wireless_mode & WIRELESS_11B)
                update_mgnt_tx_rate23a(padapter, IEEE80211_CCK_RATE_1MB);

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index 9c5d8310376db2d02f80eaa10a772c80a3717776..27752fd30c7e77ca008666b00b7710d111c8f312 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -3143,11 +3143,6 @@ void SetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val)
                rtl8723a_set_bcn_func(padapter, *val);
                break;
 
-       case HW_VAR_RESP_SIFS:
-               rtl8723a_set_resp_sifs(padapter, val[0], val[1],
-                                      val[2], val[3]);
-               break;
-
        case HW_VAR_ACK_PREAMBLE:
                rtl8723a_ack_preamble(padapter, *val);
                break;

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index edf54b77172d2bc9bdd421fc3d0340de28ed2e5b..81ebefea01571c793ee4c92a32c65403e104c457 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_RESP_SIFS,
        HW_VAR_ACK_PREAMBLE,
        HW_VAR_SEC_CFG,
        HW_VAR_RF_TYPE,