124 lines
4.9 KiB
Diff
124 lines
4.9 KiB
Diff
From: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
Date: Mon, 21 Jul 2014 11:24:52 +0200
|
|
Subject: [221/249] staging: rtl8723au: Remove another pile of useless ODM
|
|
variables
|
|
Origin: https://git.kernel.org/linus/c5f3dc2fef61458efd8ef08c3f9bd7b15c143cfd
|
|
|
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/rtl8723au/hal/odm.c | 16 ----------------
|
|
drivers/staging/rtl8723au/hal/rtl8723a_dm.c | 5 +----
|
|
drivers/staging/rtl8723au/include/odm.h | 16 +---------------
|
|
3 files changed, 2 insertions(+), 35 deletions(-)
|
|
|
|
diff --git a/drivers/staging/rtl8723au/hal/odm.c b/drivers/staging/rtl8723au/hal/odm.c
|
|
index d931169..0c4756c 100644
|
|
--- a/drivers/staging/rtl8723au/hal/odm.c
|
|
+++ b/drivers/staging/rtl8723au/hal/odm.c
|
|
@@ -418,30 +418,15 @@ void ODM23a_CmnInfoHook(struct dm_odm_t *pDM_Odm,
|
|
/* Hook call by reference pointer. */
|
|
switch (CmnInfo) {
|
|
/* Dynamic call by reference pointer. */
|
|
- case ODM_CMNINFO_MAC_PHY_MODE:
|
|
- pDM_Odm->pMacPhyMode = (u8 *)pValue;
|
|
- break;
|
|
case ODM_CMNINFO_SEC_CHNL_OFFSET:
|
|
pDM_Odm->pSecChOffset = (u8 *)pValue;
|
|
break;
|
|
- case ODM_CMNINFO_SEC_MODE:
|
|
- pDM_Odm->pSecurity = (u8 *)pValue;
|
|
- break;
|
|
case ODM_CMNINFO_BW:
|
|
pDM_Odm->pBandWidth = (u8 *)pValue;
|
|
break;
|
|
case ODM_CMNINFO_CHNL:
|
|
pDM_Odm->pChannel = (u8 *)pValue;
|
|
break;
|
|
- case ODM_CMNINFO_DMSP_GET_VALUE:
|
|
- pDM_Odm->pbGetValueFromOtherMac = (bool *)pValue;
|
|
- break;
|
|
- case ODM_CMNINFO_BUDDY_ADAPTOR:
|
|
- pDM_Odm->pBuddyAdapter = (struct rtw_adapter **)pValue;
|
|
- break;
|
|
- case ODM_CMNINFO_DMSP_IS_MASTER:
|
|
- pDM_Odm->pbMasterOfDMSP = (bool *)pValue;
|
|
- break;
|
|
case ODM_CMNINFO_SCAN:
|
|
pDM_Odm->pbScanInProcess = (bool *)pValue;
|
|
break;
|
|
@@ -589,7 +574,6 @@ 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, ("pSecChOffset =%d\n", *(pDM_Odm->pSecChOffset)));
|
|
- ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pSecurity =%d\n", *(pDM_Odm->pSecurity)));
|
|
ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pBandWidth =%d\n", *(pDM_Odm->pBandWidth)));
|
|
ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pChannel =%d\n", *(pDM_Odm->pChannel)));
|
|
|
|
diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
|
|
index fe4754f..06b1496 100644
|
|
--- a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
|
|
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
|
|
@@ -133,8 +133,7 @@ static void Init_ODM_ComInfo_8723a(struct rtw_adapter *Adapter)
|
|
|
|
static void Update_ODM_ComInfo_8723a(struct rtw_adapter *Adapter)
|
|
{
|
|
- struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
|
|
- struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;
|
|
+ struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;
|
|
struct pwrctrl_priv *pwrctrlpriv = &Adapter->pwrctrlpriv;
|
|
struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);
|
|
struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
|
|
@@ -156,8 +155,6 @@ static void Update_ODM_ComInfo_8723a(struct rtw_adapter *Adapter)
|
|
|
|
ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_SEC_CHNL_OFFSET,
|
|
&pHalData->nCur40MhzPrimeSC);
|
|
- ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_SEC_MODE,
|
|
- &Adapter->securitypriv.dot11PrivacyAlgrthm);
|
|
ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_BW,
|
|
&pHalData->CurrentChannelBW);
|
|
ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_CHNL,
|
|
diff --git a/drivers/staging/rtl8723au/include/odm.h b/drivers/staging/rtl8723au/include/odm.h
|
|
index 6fa7de6..eaee966 100644
|
|
--- a/drivers/staging/rtl8723au/include/odm.h
|
|
+++ b/drivers/staging/rtl8723au/include/odm.h
|
|
@@ -320,15 +320,10 @@ enum odm_cmninfo {
|
|
/* */
|
|
/* Dynamic value: */
|
|
/* */
|
|
- ODM_CMNINFO_MAC_PHY_MODE, /* enum odm_mac_phy_mode */
|
|
ODM_CMNINFO_SEC_CHNL_OFFSET, /* enum odm_sec_chnl_offset */
|
|
- ODM_CMNINFO_SEC_MODE, /* enum odm_security */
|
|
- ODM_CMNINFO_BW, /* enum odm_band_width */
|
|
+ ODM_CMNINFO_BW, /* enum odm_band_width */
|
|
ODM_CMNINFO_CHNL,
|
|
|
|
- ODM_CMNINFO_DMSP_GET_VALUE,
|
|
- ODM_CMNINFO_BUDDY_ADAPTOR,
|
|
- ODM_CMNINFO_DMSP_IS_MASTER,
|
|
ODM_CMNINFO_SCAN,
|
|
ODM_CMNINFO_POWER_SAVING,
|
|
ODM_CMNINFO_ONE_PATH_CCA, /* enum odm_cca_path */
|
|
@@ -709,21 +704,12 @@ struct dm_odm_t {
|
|
bool bool_temp;
|
|
struct rtw_adapter *PADAPTER_temp;
|
|
|
|
- /* MAC PHY Mode SMSP/DMSP/DMDP = 0/1/2 */
|
|
- u8 *pMacPhyMode;
|
|
/* Secondary channel offset don't_care/below/above = 0/1/2 */
|
|
u8 *pSecChOffset;
|
|
- /* Security mode Open/WEP/AES/TKIP = 0/1/2/3 */
|
|
- u8 *pSecurity;
|
|
/* BW info 20M/40M/80M = 0/1/2 */
|
|
u8 *pBandWidth;
|
|
/* Central channel location Ch1/Ch2/.... */
|
|
u8 *pChannel; /* central channel number */
|
|
- /* Common info for 92D DMSP */
|
|
-
|
|
- bool *pbGetValueFromOtherMac;
|
|
- struct rtw_adapter **pBuddyAdapter;
|
|
- bool *pbMasterOfDMSP; /* MAC0: master, MAC1: slave */
|
|
/* Common info for Status */
|
|
bool *pbScanInProcess;
|
|
bool *pbPowerSaving;
|