staging: rtl8192e: Convert typedef TSPEC_BODY to union tspec_body

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 31f4d69ca2112a5662b237abf81064a6383d2650..be5400c99d75efa9001dca6bba4202a75a592c27 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_Qos.h
+++ b/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/drivers/staging/rtl8192e/rtl819x_TS.h b/drivers/staging/rtl8192e/rtl819x_TS.h
index 0baf888e54576aa8a9675aa9b99844b8a4c656ed..b885f405c28302831872856bf870d2958eee5ebc 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_TS.h
+++ b/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/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c
index e1634055a4f490977811f2012ef07f36069be928..00dbc2e85f84a36f272db44635d1df10172bec08 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_TSProc.c
+++ b/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)?