staging: rtl8723au: ODM_BB_FA_CNT 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 406c503343adef4e250b8e0be674ae8891c763ce..8ec113fe71ec16ccf1e377d53020fe7e1c0a6275 100644 (file)
--- a/drivers/staging/rtl8723au/hal/odm.c
+++ b/drivers/staging/rtl8723au/hal/odm.c
@@ -583,12 +583,6 @@ void odm_DIG23a(struct rtw_adapter *adapter)
        u8 CurrentIGI = pDM_DigTable->CurIGValue;
 
        ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG23a() ==>\n"));
-       if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT)) {
-               ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD,
-                            ("odm_DIG23a() Return: SupportAbility ODM_BB_FA_CNT is disabled\n"));
-               return;
-       }
-
        if (adapter->mlmepriv.bScanInProcess) {
                ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG23a() Return: In Scan Progress \n"));
                return;
@@ -757,9 +751,6 @@ void odm_FalseAlarmCounterStatistics23a(struct dm_odm_t *pDM_Odm)
        u32 ret_value;
        struct false_alarm_stats *FalseAlmCnt = &pDM_Odm->FalseAlmCnt;
 
-       if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT))
-               return;
-
        /* hold ofdm counter */
         /* hold page C counter */
        ODM_SetBBReg(pDM_Odm, ODM_REG_OFDM_FA_HOLDC_11N, BIT(31), 1);
@@ -863,7 +854,7 @@ void odm_CCKPacketDetectionThresh23a(struct dm_odm_t *pDM_Odm)
        struct false_alarm_stats *FalseAlmCnt = &pDM_Odm->FalseAlmCnt;
        u8 CurCCK_CCAThres;
 
-       if (!(pDM_Odm->SupportAbility & (ODM_BB_CCK_PD|ODM_BB_FA_CNT)))
+       if (!(pDM_Odm->SupportAbility & ODM_BB_CCK_PD))
                return;
 
        if (pDM_Odm->ExtLNA)

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
index 65276e2eecc8ca0bf441a31e0b321529e3eca1a5..3524e71806b91cc74947d1c5b3f6ed83d22a2994 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
@@ -129,8 +129,7 @@ static void Update_ODM_ComInfo_8723a(struct rtw_adapter *Adapter)
        struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
        struct dm_priv  *pdmpriv = &pHalData->dmpriv;
        int i;
-       pdmpriv->InitODMFlag =  ODM_BB_FA_CNT           |
-                               ODM_BB_RSSI_MONITOR     |
+       pdmpriv->InitODMFlag =  ODM_BB_RSSI_MONITOR     |
                                ODM_BB_CCK_PD           |
                                ODM_BB_PWR_SAVE         |
                                ODM_RF_TX_PWR_TRACK     |

diff --git a/drivers/staging/rtl8723au/include/odm.h b/drivers/staging/rtl8723au/include/odm.h
index af860b3c9f59a970d1144f9b37c6b1c4ff88b1ea..ab9fe31f1ca0fe23afa895398cca5a3b589c005e 100644 (file)
--- a/drivers/staging/rtl8723au/include/odm.h
+++ b/drivers/staging/rtl8723au/include/odm.h
@@ -347,7 +347,6 @@ enum odm_cmninfo {
 /*  Define ODM support ability.  ODM_CMNINFO_ABILITY */
 enum {
        /*  BB ODM section BIT 0-15 */
-       ODM_BB_FA_CNT                           = BIT(3),
        ODM_BB_RSSI_MONITOR                     = BIT(4),
        ODM_BB_CCK_PD                           = BIT(5),
        ODM_BB_ANT_DIV                          = BIT(6),