From 65064399c2a85a2ab76e0089f2c20f766a962bc7 Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Mon, 21 Jul 2014 11:24:50 +0200 Subject: [PATCH] staging: rtl8723au: Remove ODM_CMNINFO_[RT]X_UNI and related code Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723au/hal/odm.c | 8 -------- drivers/staging/rtl8723au/hal/rtl8723a_dm.c | 4 ---- drivers/staging/rtl8723au/include/odm.h | 6 ------ 3 files changed, 18 deletions(-) diff --git a/drivers/staging/rtl8723au/hal/odm.c b/drivers/staging/rtl8723au/hal/odm.c index ed6d3af809a2..4f25606ffcda 100644 --- a/drivers/staging/rtl8723au/hal/odm.c +++ b/drivers/staging/rtl8723au/hal/odm.c @@ -421,12 +421,6 @@ void ODM23a_CmnInfoHook(struct dm_odm_t *pDM_Odm, case ODM_CMNINFO_MAC_PHY_MODE: pDM_Odm->pMacPhyMode = (u8 *)pValue; break; - case ODM_CMNINFO_TX_UNI: - pDM_Odm->pNumTxBytesUnicast = (u64 *)pValue; - break; - case ODM_CMNINFO_RX_UNI: - pDM_Odm->pNumRxBytesUnicast = (u64 *)pValue; - break; case ODM_CMNINFO_WM_MODE: pDM_Odm->pWirelessMode = (u8 *)pValue; break; @@ -600,8 +594,6 @@ void odm_CmnInfoInit_Debug23a(struct dm_odm_t *pDM_Odm) void odm_CmnInfoHook_Debug23a(struct dm_odm_t *pDM_Odm) { ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("odm_CmnInfoHook_Debug23a ==>\n")); - ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pNumTxBytesUnicast =%llu\n", *(pDM_Odm->pNumTxBytesUnicast))); - ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pNumRxBytesUnicast =%llu\n", *(pDM_Odm->pNumRxBytesUnicast))); ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pWirelessMode = 0x%x\n", *(pDM_Odm->pWirelessMode))); ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pSecChOffset =%d\n", *(pDM_Odm->pSecChOffset))); ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pSecurity =%d\n", *(pDM_Odm->pSecurity))); diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c index 479ce7ae7939..37a11c346353 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c +++ b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c @@ -154,10 +154,6 @@ static void Update_ODM_ComInfo_8723a(struct rtw_adapter *Adapter) ODM_CmnInfoUpdate23a(pDM_Odm, ODM_CMNINFO_ABILITY, pdmpriv->InitODMFlag); - ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_TX_UNI, - &Adapter->xmitpriv.tx_bytes); - ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_RX_UNI, - &Adapter->recvpriv.rx_bytes); ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_WM_MODE, &pmlmeext->cur_wireless_mode); ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_SEC_CHNL_OFFSET, diff --git a/drivers/staging/rtl8723au/include/odm.h b/drivers/staging/rtl8723au/include/odm.h index 9c8e7d8256d4..d549b7fbacf5 100644 --- a/drivers/staging/rtl8723au/include/odm.h +++ b/drivers/staging/rtl8723au/include/odm.h @@ -321,8 +321,6 @@ enum odm_cmninfo { /* Dynamic value: */ /* */ ODM_CMNINFO_MAC_PHY_MODE, /* enum odm_mac_phy_mode */ - ODM_CMNINFO_TX_UNI, - ODM_CMNINFO_RX_UNI, ODM_CMNINFO_WM_MODE, /* enum odm_wireless_mode */ ODM_CMNINFO_BAND, /* enum odm_band_type */ ODM_CMNINFO_SEC_CHNL_OFFSET, /* enum odm_sec_chnl_offset */ @@ -715,10 +713,6 @@ struct dm_odm_t { /* MAC PHY Mode SMSP/DMSP/DMDP = 0/1/2 */ u8 *pMacPhyMode; - /* TX Unicast byte count */ - u64 *pNumTxBytesUnicast; - /* RX Unicast byte count */ - u64 *pNumRxBytesUnicast; /* Wireless mode B/G/A/N = BIT0/BIT1/BIT2/BIT3 */ u8 *pWirelessMode; /* enum odm_wireless_mode */ /* Frequence band 2.4G/5G = 0/1 */ -- 2.30.2