lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: rtl8192e: Convert typedef TSPEC_BODY to union tspec_body

Browse Source 
Remove typedef from union.
Rename union.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
2011-07-19 10:25:55 -05:00
parent 42c53e7aae
commit ed306e486d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/rtl8192e/rtl819x_Qos.h
View File

@@ -70,7 +70,7 @@ union qos_tsinfo {
}field; }field;
}; };
typedef union _TSPEC_BODY{ union tspec_body {
u8 charData[55]; u8 charData[55];
struct struct
@@ -92,7 +92,7 @@ typedef union _TSPEC_BODY{
u16 SurplusBandwidthAllowance; u16 SurplusBandwidthAllowance;
u16 MediumTime; u16 MediumTime;
} f; } f;
}TSPEC_BODY, *PTSPEC_BODY; };
struct wmm_tspec { struct wmm_tspec {
u8 ID; u8 ID;
@@ -101,7 +101,7 @@ struct wmm_tspec {
u8 OUI_Type; u8 OUI_Type;
u8 OUI_SubType; u8 OUI_SubType;
u8 Version; u8 Version;
TSPEC_BODY Body; union tspec_body Body;
}; };
struct octet_string { struct octet_string {

2
drivers/staging/rtl8192e/rtl819x_TS.h
View File

@@ -36,7 +36,7 @@ struct ts_common_info {
struct timer_list SetupTimer; struct timer_list SetupTimer;
struct timer_list InactTimer; struct timer_list InactTimer;
u8 Addr[6]; u8 Addr[6];
TSPEC_BODY TSpec; union tspec_body TSpec;
QOS_TCLAS TClass[TCLAS_NUM]; QOS_TCLAS TClass[TCLAS_NUM];
u8 TClasProc; u8 TClasProc;
u8 TClasNum; u8 TClasNum;

8
drivers/staging/rtl8192e/rtl819x_TSProc.c
View File

@@ -105,7 +105,7 @@ void TsAddBaProcess(unsigned long data)
void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo) void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo)
{ {
memset(pTsCommonInfo->Addr, 0, 6); 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); memset(&pTsCommonInfo->TClass, 0, sizeof(QOS_TCLAS)*TCLAS_NUM);
pTsCommonInfo->TClasProc = 0; pTsCommonInfo->TClasProc = 0;
pTsCommonInfo->TClasNum = 0; pTsCommonInfo->TClasNum = 0;
@@ -293,7 +293,7 @@ struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ieee, u8* Addr,
void MakeTSEntry( void MakeTSEntry(
struct ts_common_info *pTsCommonInfo, struct ts_common_info *pTsCommonInfo,
u8* Addr, u8* Addr,
PTSPEC_BODY pTSPEC, union tspec_body *pTSPEC,
PQOS_TCLAS pTCLAS, PQOS_TCLAS pTCLAS,
u8 TCLAS_Num, u8 TCLAS_Num,
u8 TCLAS_Proc u8 TCLAS_Proc
@@ -307,7 +307,7 @@ void MakeTSEntry(
memcpy(pTsCommonInfo->Addr, Addr, 6); memcpy(pTsCommonInfo->Addr, Addr, 6);
if (pTSPEC != NULL) 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++) 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(QOS_TCLAS));
@@ -376,7 +376,7 @@ bool GetTs(
} }
else else
{ {
TSPEC_BODY TSpec; union tspec_body TSpec;
union qos_tsinfo *pTSInfo = &TSpec.f.TSInfo; union qos_tsinfo *pTSInfo = &TSpec.f.TSInfo;
struct list_head* pUnusedList = struct list_head* pUnusedList =
(TxRxSelect == TX_DIR)? (TxRxSelect == TX_DIR)?