From 19cd5050d03020b8823931057f535807757d7c15 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Tue, 19 Jul 2011 10:29:41 -0500
Subject: [PATCH] --- yaml --- r: 267802 b: refs/heads/master c:
 44a4004670a47135fa4dcc0473d3d28c8fb3e922 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 12402a343630..92d878b6e13b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 626f951d76279823711fd0f9b876fafee39c3dec
+refs/heads/master: 44a4004670a47135fa4dcc0473d3d28c8fb3e922
diff --git a/trunk/drivers/staging/rtl8192e/r8192E_dev.c b/trunk/drivers/staging/rtl8192e/r8192E_dev.c
index d610de92b1d5..0c06e7b84408 100644
--- a/trunk/drivers/staging/rtl8192e/r8192E_dev.c
+++ b/trunk/drivers/staging/rtl8192e/r8192E_dev.c
@@ -235,7 +235,7 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
 			struct rtllib_qos_parameters *qos_parameters = &priv->rtllib->current_network.qos_data.parameters;
 			u8	pAcParam = *((u8*)val);
 			u32	eACI = pAcParam;
-			PACI_AIFSN	pAciAifsn = (PACI_AIFSN)&(qos_parameters->aifs[0]);
+			union aci_aifsn *pAciAifsn = (union aci_aifsn *)&(qos_parameters->aifs[0]);
 			u8		acm = pAciAifsn->f.acm;
 			u8		AcmCtrl = read_nic_byte( dev, AcmHwCtrl);
 
diff --git a/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h b/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h
index e063ed812c9f..af5c627941a3 100644
--- a/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h
+++ b/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h
@@ -375,7 +375,7 @@ struct bss_qos {
 #define IsACValid(ac)		( ( ac>=0 && ac<=7 )? true : false )
 
 
-typedef	union _ACI_AIFSN{
+union aci_aifsn {
 	u8	charData;
 
 	struct
@@ -385,7 +385,7 @@ typedef	union _ACI_AIFSN{
 		u8	ACI:2;
 		u8	Reserved:1;
 	}f;
-}ACI_AIFSN, *PACI_AIFSN;
+};
 
 typedef	union _ECW{
 	u8	charData;
@@ -402,7 +402,7 @@ typedef	union _AC_PARAM{
 
 	struct
 	{
-		ACI_AIFSN	AciAifsn;
+		union aci_aifsn AciAifsn;
 		ECW		Ecw;
 		u16		TXOPLimit;
 	}f;