staging: rtl8723au: ODM_MAC_EDCA_TURBO is always set

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 a77d151f1f08aa2f8beaced1ff226d6eb711062c..8dcb020e1f181d8b08c6179839affef121a6bfc8 100644 (file)
--- a/drivers/staging/rtl8723au/hal/odm.c
+++ b/drivers/staging/rtl8723au/hal/odm.c
@@ -1368,9 +1368,6 @@ static void odm_EdcaTurboCheck23a(struct dm_odm_t *pDM_Odm)
        /*  at the same time. In the stage2/3, we need to prive universal interface and merge all */
        /*  HW dynamic mechanism. */
 
-       if (!(pDM_Odm->SupportAbility & ODM_MAC_EDCA_TURBO))
-               return;
-
        if ((pregpriv->wifi_spec == 1))/*  (pmlmeinfo->HT_enable == 0)) */
                goto dm_CheckEdcaTurbo_EXIT;
 

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
index 48edd020c0decb57e5fd754377af7bba6c83931d..85be3e0d7feb8a16f38b6ec83f735d428b17cc42 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
@@ -136,7 +136,6 @@ static void Update_ODM_ComInfo_8723a(struct rtw_adapter *Adapter)
                                ODM_BB_RSSI_MONITOR     |
                                ODM_BB_CCK_PD           |
                                ODM_BB_PWR_SAVE         |
-                               ODM_MAC_EDCA_TURBO      |
                                ODM_RF_TX_PWR_TRACK     |
                                ODM_RF_CALIBRATION;
        /*  Pointer reference */

diff --git a/drivers/staging/rtl8723au/include/odm.h b/drivers/staging/rtl8723au/include/odm.h
index 1b8189b635fb6a5bf56eb0835ec221e5c18c99d1..50459f09dbbb3814641fd44f5a98aba17cc7541d 100644 (file)
--- a/drivers/staging/rtl8723au/include/odm.h
+++ b/drivers/staging/rtl8723au/include/odm.h
@@ -362,7 +362,6 @@ enum {
        ODM_BB_RXHP                             = BIT(12),
 
        /*  MAC DM section BIT 16-23 */
-       ODM_MAC_EDCA_TURBO                      = BIT(16),
        ODM_MAC_EARLY_MODE                      = BIT(17),
 
        /*  RF ODM section BIT 24-31 */