From 828f2e9d278c698d8676b73dcf412276b24dc216 Mon Sep 17 00:00:00 2001 From: Martin Kaiser Date: Sat, 8 Jan 2022 13:49:50 +0100 Subject: [PATCH] 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 Link: https://lore.kernel.org/r/20220108124959.313215-4-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman --- drivers/staging/r8188eu/hal/odm.c | 2 -- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 1 - drivers/staging/r8188eu/include/odm.h | 1 - 3 files changed, 4 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c index 7cc9ab4b..8156e4a 100644 --- 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 2ff9c7d..adf87c1 100644 --- 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 664e75c..50960e7 100644 --- 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), -- 2.7.4