From 42c53e7aaec108cf12431d6aca9ddac90b39d573 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 19 Jul 2011 10:24:09 -0500 Subject: [PATCH] staging: rtl8192e: Convert typedef QOS_TSINFO to union qos_tsinfo Remove typedef from union. Rename union. Rename uses. Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/rtl819x_Qos.h | 7 ++++--- drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl8192e/rtl819x_Qos.h index 1a85a9c..31f4d69 100644 --- a/drivers/staging/rtl8192e/rtl819x_Qos.h +++ b/drivers/staging/rtl8192e/rtl819x_Qos.h @@ -54,7 +54,7 @@ #define BIT30 0x40000000 #define BIT31 0x80000000 -typedef union _QOS_TSINFO{ +union qos_tsinfo { u8 charData[3]; struct { u8 ucTrafficType:1; @@ -68,13 +68,14 @@ typedef union _QOS_TSINFO{ u8 ucSchedule:1; u8 ucReserved:7; }field; -}QOS_TSINFO, *PQOS_TSINFO; +}; + typedef union _TSPEC_BODY{ u8 charData[55]; struct { - QOS_TSINFO TSInfo; + union qos_tsinfo TSInfo; u16 NominalMSDUsize; u16 MaxMSDUsize; u32 MinServiceItv; diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c index 172ee46..e163405 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -377,7 +377,7 @@ bool GetTs( else { TSPEC_BODY TSpec; - PQOS_TSINFO pTSInfo = &TSpec.f.TSInfo; + union qos_tsinfo *pTSInfo = &TSpec.f.TSInfo; struct list_head* pUnusedList = (TxRxSelect == TX_DIR)? (&ieee->Tx_TS_Unused_List): -- 2.7.4