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

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
...@@ -251,7 +251,7 @@ typedef u8 AC_UAPSD, *PAC_UAPSD; ...@@ -251,7 +251,7 @@ typedef u8 AC_UAPSD, *PAC_UAPSD;
#define GET_BE_UAPSD(_apsd) ((_apsd) & BIT3) #define GET_BE_UAPSD(_apsd) ((_apsd) & BIT3)
#define SET_BE_UAPSD(_apsd) ((_apsd) |= BIT3) #define SET_BE_UAPSD(_apsd) ((_apsd) |= BIT3)
typedef union _QOS_TCLAS{ union qos_tclas {
struct _TYPE_GENERAL{ struct _TYPE_GENERAL{
u8 Priority; u8 Priority;
...@@ -300,7 +300,7 @@ typedef union _QOS_TCLAS{ ...@@ -300,7 +300,7 @@ typedef union _QOS_TCLAS{
u8 Mask; u8 Mask;
u16 TagType; u16 TagType;
} TYPE2_8021Q; } TYPE2_8021Q;
} QOS_TCLAS, *PQOS_TCLAS; };
struct qos_tstream { struct qos_tstream {
......
...@@ -37,7 +37,7 @@ struct ts_common_info { ...@@ -37,7 +37,7 @@ struct ts_common_info {
struct timer_list InactTimer; struct timer_list InactTimer;
u8 Addr[6]; u8 Addr[6];
union tspec_body TSpec; union tspec_body TSpec;
QOS_TCLAS TClass[TCLAS_NUM]; union qos_tclas TClass[TCLAS_NUM];
u8 TClasProc; u8 TClasProc;
u8 TClasNum; u8 TClasNum;
}; };
......
...@@ -106,7 +106,7 @@ void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo) ...@@ -106,7 +106,7 @@ void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo)
{ {
memset(pTsCommonInfo->Addr, 0, 6); memset(pTsCommonInfo->Addr, 0, 6);
memset(&pTsCommonInfo->TSpec, 0, sizeof(union tspec_body)); 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->TClasProc = 0;
pTsCommonInfo->TClasNum = 0; pTsCommonInfo->TClasNum = 0;
} }
...@@ -294,7 +294,7 @@ void MakeTSEntry( ...@@ -294,7 +294,7 @@ void MakeTSEntry(
struct ts_common_info *pTsCommonInfo, struct ts_common_info *pTsCommonInfo,
u8* Addr, u8* Addr,
union tspec_body *pTSPEC, union tspec_body *pTSPEC,
PQOS_TCLAS pTCLAS, union qos_tclas *pTCLAS,
u8 TCLAS_Num, u8 TCLAS_Num,
u8 TCLAS_Proc u8 TCLAS_Proc
) )
...@@ -310,7 +310,7 @@ void MakeTSEntry( ...@@ -310,7 +310,7 @@ void MakeTSEntry(
memcpy((u8*)(&(pTsCommonInfo->TSpec)), (u8*)pTSPEC, sizeof(union tspec_body)); memcpy((u8*)(&(pTsCommonInfo->TSpec)), (u8*)pTSPEC, sizeof(union tspec_body));
for (count = 0; count < TCLAS_Num; count++) 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->TClasProc = TCLAS_Proc;
pTsCommonInfo->TClasNum = TCLAS_Num; pTsCommonInfo->TClasNum = TCLAS_Num;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment