Commit b0d7de73 authored by Larry Finger's avatar Larry Finger

staging: rtl8192e: Convert typedef ACM to struct acm

Remove typedef from struct.
Rename struct.
Rename uses.
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent 8cba1432
...@@ -236,13 +236,13 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val) ...@@ -236,13 +236,13 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
u8 pAcParam = *((u8*)val); u8 pAcParam = *((u8*)val);
u32 eACI = pAcParam; u32 eACI = pAcParam;
PACI_AIFSN pAciAifsn = (PACI_AIFSN)&(qos_parameters->aifs[0]); PACI_AIFSN pAciAifsn = (PACI_AIFSN)&(qos_parameters->aifs[0]);
u8 ACM = pAciAifsn->f.ACM; u8 acm = pAciAifsn->f.acm;
u8 AcmCtrl = read_nic_byte( dev, AcmHwCtrl); u8 AcmCtrl = read_nic_byte( dev, AcmHwCtrl);
RT_TRACE(COMP_DBG, "===========>%s():HW_VAR_ACM_CTRL:%x\n", __func__,eACI); RT_TRACE(COMP_DBG, "===========>%s():HW_VAR_ACM_CTRL:%x\n", __func__,eACI);
AcmCtrl = AcmCtrl | ((priv->AcmMethod == 2)?0x0:0x1); AcmCtrl = AcmCtrl | ((priv->AcmMethod == 2)?0x0:0x1);
if ( ACM ) if (acm)
{ {
switch (eACI) switch (eACI)
{ {
...@@ -259,7 +259,7 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val) ...@@ -259,7 +259,7 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
break; break;
default: default:
RT_TRACE( COMP_QOS, "SetHwReg8185(): [HW_VAR_ACM_CTRL] ACM set failed: eACI is %d\n", eACI ); RT_TRACE( COMP_QOS, "SetHwReg8185(): [HW_VAR_ACM_CTRL] acm set failed: eACI is %d\n", eACI );
break; break;
} }
} }
......
...@@ -228,11 +228,11 @@ typedef enum _ACM_METHOD{ ...@@ -228,11 +228,11 @@ typedef enum _ACM_METHOD{
}ACM_METHOD,*PACM_METHOD; }ACM_METHOD,*PACM_METHOD;
typedef struct _ACM{ struct acm {
u64 UsedTime; u64 UsedTime;
u64 MediumTime; u64 MediumTime;
u8 HwAcmCtl; u8 HwAcmCtl;
}ACM, *PACM; };//, *struct acm *;
...@@ -329,7 +329,7 @@ struct sta_qos { ...@@ -329,7 +329,7 @@ struct sta_qos {
u8 * pWMMInfoEle; u8 * pWMMInfoEle;
u8 WMMParamEle[WMM_PARAM_ELEMENT_SIZE]; u8 WMMParamEle[WMM_PARAM_ELEMENT_SIZE];
ACM acm[4]; struct acm acm[4];
ACM_METHOD AcmMethod; ACM_METHOD AcmMethod;
struct qos_tstream StaTsArray[MAX_STA_TS_COUNT]; struct qos_tstream StaTsArray[MAX_STA_TS_COUNT];
...@@ -380,7 +380,7 @@ typedef union _ACI_AIFSN{ ...@@ -380,7 +380,7 @@ typedef union _ACI_AIFSN{
struct struct
{ {
u8 AIFSN:4; u8 AIFSN:4;
u8 ACM:1; u8 acm:1;
u8 ACI:2; u8 ACI:2;
u8 Reserved:1; u8 Reserved:1;
}f; }f;
......
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