staging: rtl8723au: rates are always set via the firmware interface

The only case where fw_ractrl = false was when the firmware failed to
load, and in that case we are dead in the water anyway.

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

diff --git a/drivers/staging/rtl8723au/hal/odm.c b/drivers/staging/rtl8723au/hal/odm.c
index 375f85d..82861e7 100644 (file)
--- a/drivers/staging/rtl8723au/hal/odm.c
+++ b/drivers/staging/rtl8723au/hal/odm.c
@@ -1289,8 +1289,7 @@ void odm_RSSIMonitorCheck23aCE(struct dm_odm_t *pDM_Odm)
 
        for (i = 0; i < sta_cnt; i++) {
                if (PWDB_rssi[i] != (0)) {
-                       if (pHalData->fw_ractrl) /*  Report every sta's RSSI to FW */
-                               rtl8723a_set_rssi_cmd(Adapter, (u8 *)&PWDB_rssi[i]);
+                       rtl8723a_set_rssi_cmd(Adapter, (u8 *)&PWDB_rssi[i]);
                }
        }
 

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
index 73cfddd..e46032e 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
@@ -5796,7 +5796,7 @@ static void
 btdm_1AntUpdateHalRAMask(struct rtw_adapter *padapter, u32 mac_id, u32 filter)
 {
        u8 init_rate = 0;
-       u8 raid;
+       u8 raid, arg;
        u32 mask;
        u8 shortGIrate = false;
        int supportRateNum = 0;
@@ -5860,26 +5860,16 @@ btdm_1AntUpdateHalRAMask(struct rtw_adapter *padapter, u32 mac_id, u32 filter)
        mask &= ~filter;
        init_rate = get_highest_rate_idx23a(mask)&0x3f;
 
-       if (pHalData->fw_ractrl) {
-               u8 arg = 0;
+       arg = mac_id&0x1f;/* MACID */
+       arg |= BIT(7);
+       if (true == shortGIrate)
+               arg |= BIT(5);
 
-               arg = mac_id&0x1f;/* MACID */
-               arg |= BIT(7);
-               if (true == shortGIrate)
-                       arg |= BIT(5);
-
-               RTPRINT(FBT, BT_TRACE,
-                       ("[BTCoex], Update FW RAID entry, MASK = 0x%08x, "
-                        "arg = 0x%02x\n", mask, arg));
-
-               rtl8723a_set_raid_cmd(padapter, mask, arg);
-       } else {
-               if (shortGIrate)
-                       init_rate |= BIT(6);
+       RTPRINT(FBT, BT_TRACE,
+               ("[BTCoex], Update FW RAID entry, MASK = 0x%08x, "
+                "arg = 0x%02x\n", mask, arg));
 
-               rtl8723au_write8(padapter, REG_INIDATA_RATE_SEL + mac_id,
-                                init_rate);
-       }
+       rtl8723a_set_raid_cmd(padapter, mask, arg);
 
        psta->init_rate = init_rate;
        pdmpriv->INIDATA_RATE[mac_id] = init_rate;

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c b/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c
index 7b56411..0b77ee1 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c
@@ -153,21 +153,7 @@ void rtl8723a_add_rateatid(struct rtw_adapter *pAdapter, u32 bitmap, u8 arg, u8
 
        bitmap |= ((raid<<28)&0xf0000000);
 
-       if (pHalData->fw_ractrl == true) {
-               rtl8723a_set_raid_cmd(pAdapter, bitmap, arg);
-       } else {
-               u8 init_rate, shortGIrate = false;
-
-               init_rate = get_highest_rate_idx23a(bitmap&0x0fffffff)&0x3f;
-
-               shortGIrate = (arg&BIT(5)) ? true:false;
-
-               if (shortGIrate == true)
-                       init_rate |= BIT(6);
-
-               rtl8723au_write8(pAdapter, REG_INIDATA_RATE_SEL + macid,
-                                init_rate);
-       }
+       rtl8723a_set_raid_cmd(pAdapter, bitmap, arg);
 }
 
 void rtl8723a_set_FwPwrMode_cmd(struct rtw_adapter *padapter, u8 Mode)

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index a5eadd4..eb82c0b 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -1095,7 +1095,6 @@ void rtl8723a_init_default_value(struct rtw_adapter *padapter)
        pdmpriv = &pHalData->dmpriv;
 
        /*  init default value */
-       pHalData->fw_ractrl = false;
        pHalData->bIQKInitialized = false;
        if (!padapter->pwrctrlpriv.bkeepfwalive)
                pHalData->LastHMEBoxNum = 0;

diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c
index 319170d..1738934 100644 (file)
--- a/drivers/staging/rtl8723au/hal/usb_halinit.c
+++ b/drivers/staging/rtl8723au/hal/usb_halinit.c
@@ -572,12 +572,10 @@ int rtl8723au_hal_init(struct rtw_adapter *Adapter)
        status = rtl8723a_FirmwareDownload(Adapter);
        if (status != _SUCCESS) {
                Adapter->bFWReady = false;
-               pHalData->fw_ractrl = false;
                DBG_8723A("fw download fail!\n");
                goto exit;
        } else {
                Adapter->bFWReady = true;
-               pHalData->fw_ractrl = true;
                DBG_8723A("fw download ok!\n");
        }
 
@@ -1212,7 +1210,7 @@ void rtl8723a_update_ramask(struct rtw_adapter *padapter,
        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
        struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
        struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;
-       u8 init_rate, networkType, raid;
+       u8 init_rate, networkType, raid, arg;
        u32 mask, rate_bitmap;
        u8 shortGIrate = false;
        int supportRateNum;
@@ -1284,27 +1282,15 @@ void rtl8723a_update_ramask(struct rtw_adapter *padapter,
 
        init_rate = get_highest_rate_idx23a(mask) & 0x3f;
 
-       if (pHalData->fw_ractrl == true) {
-               u8 arg = 0;
+       arg = mac_id & 0x1f;/* MACID */
+       arg |= BIT(7);
 
-               arg = mac_id & 0x1f;/* MACID */
+       if (shortGIrate == true)
+               arg |= BIT(5);
 
-               arg |= BIT(7);
+       DBG_8723A("update raid entry, mask = 0x%x, arg = 0x%x\n", mask, arg);
 
-               if (shortGIrate == true)
-                       arg |= BIT(5);
-
-               DBG_8723A("update raid entry, mask = 0x%x, arg = 0x%x\n",
-                         mask, arg);
-
-               rtl8723a_set_raid_cmd(padapter, mask, arg);
-       } else {
-               if (shortGIrate == true)
-                       init_rate |= BIT(6);
-
-               rtl8723au_write8(padapter, (REG_INIDATA_RATE_SEL + mac_id),
-                                init_rate);
-       }
+       rtl8723a_set_raid_cmd(padapter, mask, arg);
 
        /* set ra_id */
        psta->raid = raid;

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_hal.h b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
index e146336..5841915 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_hal.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
@@ -348,7 +348,6 @@ struct hal_data_8723a {
        /* for host message to fw */
        u8      LastHMEBoxNum;
 
-       u8      fw_ractrl;
        u8      RegTxPause;
        /*  Beacon function related global variable. */
        u8      RegFwHwTxQCtrl;