diff --git a/[refs] b/[refs]
index de890deffa9b..3277deee0c5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3e9909916abfdfe8863d8d67ab1ef49e3ded53c
+refs/heads/master: 42c53e7aaec108cf12431d6aca9ddac90b39d573
diff --git a/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h b/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h
index 1a85a9cb4030..31f4d69ca211 100644
--- a/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h
+++ b/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h
@@ -54,7 +54,7 @@
 #define BIT30                   0x40000000
 #define BIT31                   0x80000000
 
-typedef union _QOS_TSINFO{
+union qos_tsinfo {
 	u8		charData[3];
 	struct {
 		u8		ucTrafficType:1;
@@ -68,13 +68,14 @@ typedef union _QOS_TSINFO{
 		u8		ucSchedule:1;
 		u8		ucReserved:7;
 	}field;
-}QOS_TSINFO, *PQOS_TSINFO;
+};
+
 typedef union _TSPEC_BODY{
 	u8		charData[55];
 
 	struct
 	{
-		QOS_TSINFO	TSInfo;
+		union qos_tsinfo TSInfo;
 		u16	NominalMSDUsize;
 		u16	MaxMSDUsize;
 		u32	MinServiceItv;
diff --git a/trunk/drivers/staging/rtl8192e/rtl819x_TSProc.c b/trunk/drivers/staging/rtl8192e/rtl819x_TSProc.c
index 172ee46087fc..e1634055a4f4 100644
--- a/trunk/drivers/staging/rtl8192e/rtl819x_TSProc.c
+++ b/trunk/drivers/staging/rtl8192e/rtl819x_TSProc.c
@@ -377,7 +377,7 @@ bool GetTs(
 		else
 		{
 			TSPEC_BODY	TSpec;
-			PQOS_TSINFO		pTSInfo = &TSpec.f.TSInfo;
+			union qos_tsinfo *pTSInfo = &TSpec.f.TSInfo;
 			struct list_head*	pUnusedList =
 								(TxRxSelect == TX_DIR)?
 								(&ieee->Tx_TS_Unused_List):