Commit 626f951d authored by Larry Finger's avatar Larry Finger
Browse files

staging: rtl8192e: Convert typedef QOS_TCLAS to union qos_tclas 



Remove typedef from union.
Rename union.
Rename uses.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent ed306e48

drivers/staging/rtl8192e/rtl819x_Qos.h

+2 −2
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ typedef u8 AC_UAPSD, *PAC_UAPSD; 
#define	GET_BE_UAPSD(_apsd) ((_apsd) & BIT3)

#define	SET_BE_UAPSD(_apsd) ((_apsd) |= BIT3)



typedef union _QOS_TCLAS{

union qos_tclas {



	struct _TYPE_GENERAL{

		u8		Priority;
@@ -300,7 +300,7 @@ typedef union _QOS_TCLAS{ 
		u8		Mask;

		u16		TagType;

	} TYPE2_8021Q;

} QOS_TCLAS, *PQOS_TCLAS;

};



struct qos_tstream {

drivers/staging/rtl8192e/rtl819x_TS.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ struct ts_common_info { 
	struct timer_list		InactTimer;

	u8				Addr[6];

	union tspec_body TSpec;

	QOS_TCLAS			TClass[TCLAS_NUM];

	union qos_tclas TClass[TCLAS_NUM];

	u8				TClasProc;

	u8				TClasNum;

};

drivers/staging/rtl8192e/rtl819x_TSProc.c

+3 −3
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo) 
{

	memset(pTsCommonInfo->Addr, 0, 6);

	memset(&pTsCommonInfo->TSpec, 0, sizeof(union tspec_body));

	memset(&pTsCommonInfo->TClass, 0, sizeof(QOS_TCLAS)*TCLAS_NUM);

	memset(&pTsCommonInfo->TClass, 0, sizeof(union qos_tclas)*TCLAS_NUM);

	pTsCommonInfo->TClasProc = 0;

	pTsCommonInfo->TClasNum = 0;

}
@@ -294,7 +294,7 @@ void MakeTSEntry( 
		struct ts_common_info *pTsCommonInfo,

		u8*		Addr,

		union tspec_body *pTSPEC,

		PQOS_TCLAS	pTCLAS,

		union qos_tclas *pTCLAS,

		u8		TCLAS_Num,

		u8		TCLAS_Proc

	)
@@ -310,7 +310,7 @@ void MakeTSEntry( 
		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));

		memcpy((u8*)(&(pTsCommonInfo->TClass[count])), (u8*)pTCLAS, sizeof(union qos_tclas));



	pTsCommonInfo->TClasProc = TCLAS_Proc;

	pTsCommonInfo->TClasNum = TCLAS_Num;