staging: r8188eu: ODM_BB_CCK_PD is always set

The ODM_BB_CCK_PD flag is always set.

Remove the flag and the check if ODM_BB_CCK_PD is not set.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220108124959.313215-4-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index 7cc9ab4b1a59a97fac94a4e1b7a8f56c43bd2bcf..8156e4acaa09cf24ac9ac6265926ad7622945dbe 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -416,8 +416,6 @@ static void odm_CCKPacketDetectionThresh(struct odm_dm_struct *pDM_Odm)
        u8 CurCCK_CCAThres;
        struct false_alarm_stats *FalseAlmCnt = &pDM_Odm->FalseAlmCnt;
 
-       if (!(pDM_Odm->SupportAbility & ODM_BB_CCK_PD))
-               return;
        if (pDM_Odm->bLinked) {
                if (pDM_Odm->RSSI_Min > 25) {
                        CurCCK_CCAThres = 0xcd;

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
index 2ff9c7d84dbf2410805324a9c85dc77da97fb7d0..adf87c1721eea5469fd824c3a647d3de792db1d0 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
@@ -54,7 +54,6 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter)
        int i;
 
        pdmpriv->InitODMFlag = ODM_BB_RSSI_MONITOR |
-                               ODM_BB_CCK_PD |
                                ODM_RF_CALIBRATION |
                                ODM_RF_TX_PWR_TRACK;
        if (hal_data->AntDivCfg)

diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index 664e75c3a7c2acb93d8878a47a2e6cf1f2a04f3e..50960e7daf1df33c7576f88978fc95fe973a511d 100644 (file)
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -149,7 +149,6 @@ enum odm_common_info_def {
 enum odm_ability_def {
        /*  BB ODM section BIT 0-15 */
        ODM_BB_RSSI_MONITOR             = BIT(4),
-       ODM_BB_CCK_PD                   = BIT(5),
        ODM_BB_ANT_DIV                  = BIT(6),
        ODM_BB_PWR_TRA                  = BIT(8),