Commit 399ec830 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman

staging: rtl8723au: ODM_BB_FA_CNT is always set

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6920f3b9
...@@ -583,12 +583,6 @@ void odm_DIG23a(struct rtw_adapter *adapter) ...@@ -583,12 +583,6 @@ void odm_DIG23a(struct rtw_adapter *adapter)
u8 CurrentIGI = pDM_DigTable->CurIGValue; u8 CurrentIGI = pDM_DigTable->CurIGValue;
ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG23a() ==>\n")); 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) { if (adapter->mlmepriv.bScanInProcess) {
ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG23a() Return: In Scan Progress \n")); ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG23a() Return: In Scan Progress \n"));
return; return;
...@@ -757,9 +751,6 @@ void odm_FalseAlarmCounterStatistics23a(struct dm_odm_t *pDM_Odm) ...@@ -757,9 +751,6 @@ void odm_FalseAlarmCounterStatistics23a(struct dm_odm_t *pDM_Odm)
u32 ret_value; u32 ret_value;
struct false_alarm_stats *FalseAlmCnt = &pDM_Odm->FalseAlmCnt; struct false_alarm_stats *FalseAlmCnt = &pDM_Odm->FalseAlmCnt;
if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT))
return;
/* hold ofdm counter */ /* hold ofdm counter */
/* hold page C counter */ /* hold page C counter */
ODM_SetBBReg(pDM_Odm, ODM_REG_OFDM_FA_HOLDC_11N, BIT(31), 1); 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) ...@@ -863,7 +854,7 @@ void odm_CCKPacketDetectionThresh23a(struct dm_odm_t *pDM_Odm)
struct false_alarm_stats *FalseAlmCnt = &pDM_Odm->FalseAlmCnt; struct false_alarm_stats *FalseAlmCnt = &pDM_Odm->FalseAlmCnt;
u8 CurCCK_CCAThres; u8 CurCCK_CCAThres;
if (!(pDM_Odm->SupportAbility & (ODM_BB_CCK_PD|ODM_BB_FA_CNT))) if (!(pDM_Odm->SupportAbility & ODM_BB_CCK_PD))
return; return;
if (pDM_Odm->ExtLNA) if (pDM_Odm->ExtLNA)
......
...@@ -129,8 +129,7 @@ static void Update_ODM_ComInfo_8723a(struct rtw_adapter *Adapter) ...@@ -129,8 +129,7 @@ static void Update_ODM_ComInfo_8723a(struct rtw_adapter *Adapter)
struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
int i; int i;
pdmpriv->InitODMFlag = ODM_BB_FA_CNT | pdmpriv->InitODMFlag = ODM_BB_RSSI_MONITOR |
ODM_BB_RSSI_MONITOR |
ODM_BB_CCK_PD | ODM_BB_CCK_PD |
ODM_BB_PWR_SAVE | ODM_BB_PWR_SAVE |
ODM_RF_TX_PWR_TRACK | ODM_RF_TX_PWR_TRACK |
......
...@@ -347,7 +347,6 @@ enum odm_cmninfo { ...@@ -347,7 +347,6 @@ enum odm_cmninfo {
/* Define ODM support ability. ODM_CMNINFO_ABILITY */ /* Define ODM support ability. ODM_CMNINFO_ABILITY */
enum { enum {
/* BB ODM section BIT 0-15 */ /* BB ODM section BIT 0-15 */
ODM_BB_FA_CNT = BIT(3),
ODM_BB_RSSI_MONITOR = BIT(4), ODM_BB_RSSI_MONITOR = BIT(4),
ODM_BB_CCK_PD = BIT(5), ODM_BB_CCK_PD = BIT(5),
ODM_BB_ANT_DIV = BIT(6), ODM_BB_ANT_DIV = BIT(6),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment