From 0d1f49298b9a5a5f00a1629c8ac462028f7df359 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Mon, 18 Jul 2011 22:21:17 -0500
Subject: [PATCH] --- yaml --- r: 267755 b: refs/heads/master c:
 b0d7de7314d359ec52d8ba3660e1d5c729e44161 h: refs/heads/master i:   267753:
 52fded1af6ab94f340c8add6756487140ab3c191   267751:
 7452f6dbd84a297e2e9b92d84a7a5e4eccd69114 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/staging/rtl8192e/r8192E_dev.c  | 6 +++---
 trunk/drivers/staging/rtl8192e/rtl819x_Qos.h | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 02958b81e1e2..bc8a2f06e14a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cba1432cee4c88668160750f1892aa09a2ba56a
+refs/heads/master: b0d7de7314d359ec52d8ba3660e1d5c729e44161
diff --git a/trunk/drivers/staging/rtl8192e/r8192E_dev.c b/trunk/drivers/staging/rtl8192e/r8192E_dev.c
index 9bff1d03360e..2b3da4dbd5a8 100644
--- a/trunk/drivers/staging/rtl8192e/r8192E_dev.c
+++ b/trunk/drivers/staging/rtl8192e/r8192E_dev.c
@@ -236,13 +236,13 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
 			u8	pAcParam = *((u8*)val);
 			u32	eACI = pAcParam;
 			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);
 
 			RT_TRACE(COMP_DBG, "===========>%s():HW_VAR_ACM_CTRL:%x\n", __func__,eACI);
 			AcmCtrl = AcmCtrl | ((priv->AcmMethod == 2)?0x0:0x1);
 
-			if ( ACM )
+			if (acm)
 			{
 				switch (eACI)
 				{
@@ -259,7 +259,7 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
 					break;
 
 				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;
 				}
 			}
diff --git a/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h b/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h
index 93a9c13f4e3b..1a85a9cb4030 100644
--- a/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h
+++ b/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h
@@ -228,11 +228,11 @@ typedef	enum _ACM_METHOD{
 }ACM_METHOD,*PACM_METHOD;
 
 
-typedef struct _ACM{
+struct acm {
 	u64		UsedTime;
 	u64		MediumTime;
 	u8		HwAcmCtl;
-}ACM, *PACM;
+};//, *struct acm *;
 
 
 
@@ -329,7 +329,7 @@ struct sta_qos {
 	u8 *				pWMMInfoEle;
 	u8				WMMParamEle[WMM_PARAM_ELEMENT_SIZE];
 
-	ACM				acm[4];
+	struct acm acm[4];
 	ACM_METHOD		AcmMethod;
 
 	struct qos_tstream StaTsArray[MAX_STA_TS_COUNT];
@@ -380,7 +380,7 @@ typedef	union _ACI_AIFSN{
 	struct
 	{
 		u8	AIFSN:4;
-		u8	ACM:1;
+		u8	acm:1;
 		u8	ACI:2;
 		u8	Reserved:1;
 	}f;