From 8fd80041bf0976602bccc652cb3fe694d97d8c13 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 11 Mar 2015 13:43:51 -0500 Subject: [PATCH] rtl8188eu: Remove CONFIG_DISABLE_ODM Signed-off-by: Larry Finger --- hal/rtl8188e_dm.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/hal/rtl8188e_dm.c b/hal/rtl8188e_dm.c index bc8a740..8490d0d 100755 --- a/hal/rtl8188e_dm.c +++ b/hal/rtl8188e_dm.c @@ -173,19 +173,12 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter) ODM_CmnInfoInit(pDM_Odm, ODM_CMNINFO_RF_ANTENNA_TYPE, pHalData->TRxAntDivType); - #ifdef CONFIG_DISABLE_ODM - pdmpriv->InitODMFlag = 0; - #else - pdmpriv->InitODMFlag = ODM_RF_CALIBRATION | - ODM_RF_TX_PWR_TRACK /* */ - ; - /* if(pHalData->AntDivCfg) */ - /* pdmpriv->InitODMFlag |= ODM_BB_ANT_DIV; */ - #endif - + pdmpriv->InitODMFlag = ODM_RF_CALIBRATION | + ODM_RF_TX_PWR_TRACK ; ODM_CmnInfoUpdate(pDM_Odm,ODM_CMNINFO_ABILITY,pdmpriv->InitODMFlag); } + static void Update_ODM_ComInfo_88E(struct adapter *Adapter) { struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; @@ -223,10 +216,6 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter) } #endif/* MP_DRIVER==1) */ -#ifdef CONFIG_DISABLE_ODM - pdmpriv->InitODMFlag = 0; -#endif/* CONFIG_DISABLE_ODM */ - ODM_CmnInfoUpdate(pDM_Odm,ODM_CMNINFO_ABILITY,pdmpriv->InitODMFlag); ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_TX_UNI,&(Adapter->xmitpriv.tx_bytes)); @@ -319,10 +308,6 @@ rtl8188e_HalDmWatchDog( u8 bLinked=false; u8 bsta_state = false; - #ifdef CONFIG_DISABLE_ODM - pHalData->odmpriv.SupportAbility = 0; - #endif - if(rtw_linked_check(Adapter)) bLinked = true;