diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-07-19 10:25:55 -0500 |
|---|---|---|
| committer | Larry Finger <Larry.Finger@lwfinger.net> | 2011-08-24 01:57:29 -0500 |
| commit | ed306e486d673a3ba4f9b0f2ab15afab0a6ba171 (patch) | |
| tree | 8ef518ac9975fd132fe1b20ea13932a7cb96ae3b | |
| parent | 42c53e7aaec108cf12431d6aca9ddac90b39d573 (diff) | |
| download | op-kernel-dev-ed306e486d673a3ba4f9b0f2ab15afab0a6ba171.zip op-kernel-dev-ed306e486d673a3ba4f9b0f2ab15afab0a6ba171.tar.gz | |
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>
| -rw-r--r-- | drivers/staging/rtl8192e/rtl819x_Qos.h | 6 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl819x_TS.h | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl819x_TSProc.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl8192e/rtl819x_Qos.h index 31f4d69..be5400c 100644 --- 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 0baf888..b885f40 100644 --- 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 e163405..00dbc2e 100644 --- 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)? |
