staging: rtl8192e: Convert typedef QOS_TCLAS to union qos_tclas

Remove typedef from union.
Rename union.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl8192e/rtl819x_Qos.h
index be5400c99d75efa9001dca6bba4202a75a592c27..e063ed812c9f85ddb7bd68a2475978781dfdc857 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192e/rtl819x_Qos.h
@@ -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 {
 

diff --git a/drivers/staging/rtl8192e/rtl819x_TS.h b/drivers/staging/rtl8192e/rtl819x_TS.h
index b885f405c28302831872856bf870d2958eee5ebc..279b1cc9a2dda7f6b1ef17051a5e0cf96753988f 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_TS.h
+++ b/drivers/staging/rtl8192e/rtl819x_TS.h
@@ -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;
 };

diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c
index 00dbc2e85f84a36f272db44635d1df10172bec08..7947e376e05d66049e1e40911ca9e60b70f23f56 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c
@@ -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;