---

yaml --- r: 267800 b: refs/heads/master c: ed306e4 h: refs/heads/master v: v3
git-mirror · Aug 24, 2011 · e5bfaea · e5bfaea
1 parent 4f7866e
commit e5bfaea
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42c53e7aaec108cf12431d6aca9ddac90b39d573
+refs/heads/master: ed306e486d673a3ba4f9b0f2ab15afab0a6ba171
diff --git a/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h b/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h
@@ -70,7 +70,7 @@ union qos_tsinfo {
 	}field;
 };
 
-typedef union _TSPEC_BODY{
+union tspec_body {
 	u8		charData[55];
 
 	struct
@@ -92,7 +92,7 @@ typedef union _TSPEC_BODY{
 		u16	SurplusBandwidthAllowance;
 		u16	MediumTime;
 	} f;
-}TSPEC_BODY, *PTSPEC_BODY;
+};
 
 struct wmm_tspec {
 	u8		ID;
@@ -101,7 +101,7 @@ struct wmm_tspec {
 	u8		OUI_Type;
 	u8		OUI_SubType;
 	u8		Version;
-	TSPEC_BODY	Body;
+	union tspec_body Body;
 };
 
 struct octet_string {

diff --git a/trunk/drivers/staging/rtl8192e/rtl819x_TS.h b/trunk/drivers/staging/rtl8192e/rtl819x_TS.h
@@ -36,7 +36,7 @@ struct ts_common_info {
 	struct timer_list		SetupTimer;
 	struct timer_list		InactTimer;
 	u8				Addr[6];
-	TSPEC_BODY			TSpec;
+	union tspec_body TSpec;
 	QOS_TCLAS			TClass[TCLAS_NUM];
 	u8				TClasProc;
 	u8				TClasNum;

diff --git a/trunk/drivers/staging/rtl8192e/rtl819x_TSProc.c b/trunk/drivers/staging/rtl8192e/rtl819x_TSProc.c
@@ -105,7 +105,7 @@ void TsAddBaProcess(unsigned long data)
 void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo)
 {
 	memset(pTsCommonInfo->Addr, 0, 6);
-	memset(&pTsCommonInfo->TSpec, 0, sizeof(TSPEC_BODY));
+	memset(&pTsCommonInfo->TSpec, 0, sizeof(union tspec_body));
 	memset(&pTsCommonInfo->TClass, 0, sizeof(QOS_TCLAS)*TCLAS_NUM);
 	pTsCommonInfo->TClasProc = 0;
 	pTsCommonInfo->TClasNum = 0;
@@ -293,7 +293,7 @@ struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ieee, u8*	Addr,
 void MakeTSEntry(
 		struct ts_common_info *pTsCommonInfo,
 		u8*		Addr,
-		PTSPEC_BODY	pTSPEC,
+		union tspec_body *pTSPEC,
 		PQOS_TCLAS	pTCLAS,
 		u8		TCLAS_Num,
 		u8		TCLAS_Proc
@@ -307,7 +307,7 @@ void MakeTSEntry(
 	memcpy(pTsCommonInfo->Addr, Addr, 6);
 
 	if (pTSPEC != NULL)
-		memcpy((u8*)(&(pTsCommonInfo->TSpec)), (u8*)pTSPEC, sizeof(TSPEC_BODY));
+		memcpy((u8*)(&(pTsCommonInfo->TSpec)), (u8*)pTSPEC, sizeof(union tspec_body));
 
 	for (count = 0; count < TCLAS_Num; count++)
 		memcpy((u8*)(&(pTsCommonInfo->TClass[count])), (u8*)pTCLAS, sizeof(QOS_TCLAS));
@@ -376,7 +376,7 @@ bool GetTs(
 		}
 		else
 		{
-			TSPEC_BODY	TSpec;
+			union tspec_body TSpec;
 			union qos_tsinfo *pTSInfo = &TSpec.f.TSInfo;
 			struct list_head*	pUnusedList =
 								(TxRxSelect == TX_DIR)?