This patch completes the removal of typedef statements. Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx> --- drivers/staging/rtl8192e/r8192E_dev.c | 11 ++--- drivers/staging/rtl8192e/r8192E_phy.c | 8 ++-- drivers/staging/rtl8192e/rtl819x_BAProc.c | 38 +++++++++------- drivers/staging/rtl8192e/rtl819x_HT.h | 4 +- drivers/staging/rtl8192e/rtl819x_Qos.h | 37 ++++++++------- drivers/staging/rtl8192e/rtl819x_TS.h | 16 +++--- drivers/staging/rtl8192e/rtl819x_TSProc.c | 59 ++++++++++++------------ drivers/staging/rtl8192e/rtl_core.h | 70 +++++++++++++---------------- drivers/staging/rtl8192e/rtl_debug.h | 5 +- drivers/staging/rtl8192e/rtl_dm.c | 22 +++++---- drivers/staging/rtl8192e/rtl_dm.h | 19 +++----- drivers/staging/rtl8192e/rtllib.h | 21 +++++---- drivers/staging/rtl8192e/rtllib_rx.c | 22 +++++---- drivers/staging/rtl8192e/rtllib_softmac.c | 6 +- drivers/staging/rtl8192e/rtllib_tx.c | 10 +++-- 15 files changed, 175 insertions(+), 173 deletions(-) Index: staging-2.6/drivers/staging/rtl8192e/r8192E_dev.c =================================================================== --- staging-2.6.orig/drivers/staging/rtl8192e/r8192E_dev.c +++ staging-2.6/drivers/staging/rtl8192e/r8192E_dev.c @@ -918,7 +918,7 @@ start: TempCCk = rtl8192_QueryBBReg(dev, rCCK0_TxFilter1, bMaskByte2); - for (i = 0; i < CCKTxBBGainTableLength; i++) { + for (i = 0; i < CCKTxBBGainTL; i++) { if (TempCCk == priv->cck_txbbgain_table[i].ccktxbb_valuearray[0]) { priv->CCKPresentAttentuation_20Mdefault =(u8) i; break; @@ -2280,12 +2280,9 @@ u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRa return tmp_Short; } -void -ActUpdateChannelAccessSetting( - struct net_device* dev, - enum wireless_mode WirelessMode, - PCHANNEL_ACCESS_SETTING ChnlAccessSetting - ) +void ActUpdateChannelAccessSetting(struct net_device *dev, + enum wireless_mode WirelessMode, + struct channel_access_setting *ChnlAccessSetting) { struct r8192_priv* priv = rtllib_priv(dev); Index: staging-2.6/drivers/staging/rtl8192e/r8192E_phy.c =================================================================== --- staging-2.6.orig/drivers/staging/rtl8192e/r8192E_phy.c +++ staging-2.6/drivers/staging/rtl8192e/r8192E_phy.c @@ -1089,8 +1089,8 @@ static void CCK_Tx_Power_Track_BW_Switch priv->CCKPresentAttentuation = priv->CCKPresentAttentuation_20Mdefault + priv->CCKPresentAttentuation_difference; - if (priv->CCKPresentAttentuation > (CCKTxBBGainTableLength-1)) - priv->CCKPresentAttentuation = CCKTxBBGainTableLength-1; + if (priv->CCKPresentAttentuation > (CCKTxBBGainTL - 1)) + priv->CCKPresentAttentuation = CCKTxBBGainTL - 1; if (priv->CCKPresentAttentuation < 0) priv->CCKPresentAttentuation = 0; @@ -1115,8 +1115,8 @@ static void CCK_Tx_Power_Track_BW_Switch priv->CCKPresentAttentuation_40Mdefault + priv->CCKPresentAttentuation_difference; RT_TRACE(COMP_POWER_TRACKING, "40M, priv->CCKPresentAttentuation = %d\n", priv->CCKPresentAttentuation); - if (priv->CCKPresentAttentuation > (CCKTxBBGainTableLength-1)) - priv->CCKPresentAttentuation = CCKTxBBGainTableLength-1; + if (priv->CCKPresentAttentuation > (CCKTxBBGainTL - 1)) + priv->CCKPresentAttentuation = CCKTxBBGainTL - 1; if (priv->CCKPresentAttentuation < 0) priv->CCKPresentAttentuation = 0; Index: staging-2.6/drivers/staging/rtl8192e/rtl819x_BAProc.c =================================================================== --- staging-2.6.orig/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ staging-2.6/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -33,7 +33,8 @@ void DeActivateBAEntry( struct rtllib_de pBA->bValid = false; del_timer_sync(&pBA->Timer); } -u8 TxTsDeleteBA( struct rtllib_device* ieee, PTX_TS_RECORD pTxTs) + +u8 TxTsDeleteBA( struct rtllib_device* ieee, struct tx_ts_record *pTxTs) { struct ba_record *pAdmittedBa = &pTxTs->TxAdmittedBARecord; struct ba_record *pPendingBa = &pTxTs->TxPendingBARecord; @@ -54,7 +55,7 @@ u8 TxTsDeleteBA( struct rtllib_device* i return bSendDELBA; } -u8 RxTsDeleteBA( struct rtllib_device* ieee, PRX_TS_RECORD pRxTs) +u8 RxTsDeleteBA( struct rtllib_device* ieee, struct rx_ts_record *pRxTs) { struct ba_record *pBa = &pRxTs->RxAdmittedBARecord; u8 bSendDELBA = false; @@ -248,7 +249,7 @@ int rtllib_rx_ADDBAReq( struct rtllib_de union ba_param_set *pBaParamSet = NULL; u16* pBaTimeoutVal = NULL; union sequence_control *pBaStartSeqCtrl = NULL; - PRX_TS_RECORD pTS = NULL; + struct rx_ts_record *pTS = NULL; if (skb->len < sizeof( struct rtllib_hdr_3addr) + 9) { @@ -277,7 +278,7 @@ int rtllib_rx_ADDBAReq( struct rtllib_de } if (!GetTs( ieee, - (PTS_COMMON_INFO*)(&pTS), + (struct ts_common_info **)(&pTS), dst, (u8)(pBaParamSet->field.TID), RX_DIR, @@ -333,7 +334,7 @@ int rtllib_rx_ADDBARsp( struct rtllib_de { struct rtllib_hdr_3addr* rsp = NULL; struct ba_record *pPendingBA, *pAdmittedBA; - PTX_TS_RECORD pTS = NULL; + struct tx_ts_record *pTS = NULL; u8* dst = NULL, *pDialogToken = NULL, *tag = NULL; u16* pStatusCode = NULL, *pBaTimeoutVal = NULL; union ba_param_set *pBaParamSet = NULL; @@ -365,7 +366,7 @@ int rtllib_rx_ADDBARsp( struct rtllib_de } - if (!GetTs(ieee, (PTS_COMMON_INFO*)(&pTS), dst, + if (!GetTs(ieee, (struct ts_common_info **)(&pTS), dst, (u8)(pBaParamSet->field.TID), TX_DIR, false)) { RTLLIB_DEBUG(RTLLIB_DL_ERR, "can't get TS in %s()\n", __func__); ReasonCode = DELBA_REASON_UNKNOWN_BA; @@ -461,11 +462,11 @@ int rtllib_rx_DELBA(struct rtllib_device if (pDelBaParamSet->field.Initiator == 1) { - PRX_TS_RECORD pRxTs; + struct rx_ts_record *pRxTs; if ( !GetTs( ieee, - (PTS_COMMON_INFO*)&pRxTs, + (struct ts_common_info **)&pRxTs, dst, (u8)pDelBaParamSet->field.TID, RX_DIR, @@ -479,11 +480,11 @@ int rtllib_rx_DELBA(struct rtllib_device } else { - PTX_TS_RECORD pTxTs; + struct tx_ts_record *pTxTs; if (!GetTs( ieee, - (PTS_COMMON_INFO*)&pTxTs, + (struct ts_common_info **)&pTxTs, dst, (u8)pDelBaParamSet->field.TID, TX_DIR, @@ -505,7 +506,7 @@ int rtllib_rx_DELBA(struct rtllib_device void TsInitAddBA( struct rtllib_device* ieee, - PTX_TS_RECORD pTS, + struct tx_ts_record *pTS, u8 Policy, u8 bOverwritePending ) @@ -530,13 +531,15 @@ TsInitAddBA( rtllib_send_ADDBAReq(ieee, pTS->TsCommonInfo.Addr, pBA); } -void TsInitDelBA(struct rtllib_device *ieee, PTS_COMMON_INFO pTsCommonInfo, +void TsInitDelBA(struct rtllib_device *ieee, + struct ts_common_info *pTsCommonInfo, enum tr_select TxRxSelect) { if (TxRxSelect == TX_DIR) { - PTX_TS_RECORD pTxTs = (PTX_TS_RECORD)pTsCommonInfo; + struct tx_ts_record *pTxTs = (struct tx_ts_record *) + pTsCommonInfo; if (TxTsDeleteBA(ieee, pTxTs)) rtllib_send_DELBA( @@ -548,7 +551,8 @@ void TsInitDelBA(struct rtllib_device *i } else if (TxRxSelect == RX_DIR) { - PRX_TS_RECORD pRxTs = (PRX_TS_RECORD)pTsCommonInfo; + struct rx_ts_record *pRxTs = (struct rx_ts_record *) + pTsCommonInfo; if (RxTsDeleteBA(ieee, pRxTs)) rtllib_send_DELBA( ieee, @@ -560,7 +564,7 @@ void TsInitDelBA(struct rtllib_device *i } void BaSetupTimeOut(unsigned long data) { - PTX_TS_RECORD pTxTs = (PTX_TS_RECORD)data; + struct tx_ts_record *pTxTs = (struct tx_ts_record *)data; pTxTs->bAddBaReqInProgress = false; pTxTs->bAddBaReqDelayed = true; @@ -569,7 +573,7 @@ void BaSetupTimeOut(unsigned long data) void TxBaInactTimeout(unsigned long data) { - PTX_TS_RECORD pTxTs = (PTX_TS_RECORD)data; + struct tx_ts_record *pTxTs = (struct tx_ts_record *)data; struct rtllib_device *ieee = container_of(pTxTs, struct rtllib_device, TxTsRecord[pTxTs->num]); TxTsDeleteBA(ieee, pTxTs); rtllib_send_DELBA( @@ -582,7 +586,7 @@ void TxBaInactTimeout(unsigned long data void RxBaInactTimeout(unsigned long data) { - PRX_TS_RECORD pRxTs = (PRX_TS_RECORD)data; + struct rx_ts_record *pRxTs = (struct rx_ts_record *)data; struct rtllib_device *ieee = container_of(pRxTs, struct rtllib_device, RxTsRecord[pRxTs->num]); RxTsDeleteBA(ieee, pRxTs); Index: staging-2.6/drivers/staging/rtl8192e/rtl819x_HT.h =================================================================== --- staging-2.6.orig/drivers/staging/rtl8192e/rtl819x_HT.h +++ staging-2.6/drivers/staging/rtl8192e/rtl819x_HT.h @@ -160,11 +160,11 @@ struct ht_information_ele { u8 BasicMSC[16]; } __packed; -typedef struct _MIMOPS_CTRL{ +struct mimops_ctrl { u8 MimoPsEnable:1; u8 MimoPsMode:1; u8 Reserved:6; -} MIMOPS_CTRL, *PMIMOPS_CTRL; +}; enum ht_spec_ver { HT_SPEC_VER_IEEE = 0, Index: staging-2.6/drivers/staging/rtl8192e/rtl819x_Qos.h =================================================================== --- staging-2.6.orig/drivers/staging/rtl8192e/rtl819x_Qos.h +++ staging-2.6/drivers/staging/rtl8192e/rtl819x_Qos.h @@ -94,7 +94,7 @@ union tspec_body { } f; }; -typedef struct _WMM_TSPEC{ +struct wmm_tspec { u8 ID; u8 Length; u8 OUI[3]; @@ -102,12 +102,13 @@ typedef struct _WMM_TSPEC{ u8 OUI_SubType; u8 Version; union tspec_body Body; -} WMM_TSPEC, *PWMM_TSPEC; +}; -typedef struct _OCTET_STRING{ +struct octet_string { u8 *Octet; u16 Length; -}OCTET_STRING, *POCTET_STRING; +}; + #define MAX_WMMELE_LENGTH 64 #define QOS_DISABLE 0 @@ -228,11 +229,11 @@ enum acm_method { }; -typedef struct _ACM{ +struct acm { u64 UsedTime; u64 MediumTime; u8 HwAcmCtl; -}ACM, *PACM; +}; #define GET_VO_UAPSD(_apsd) ((_apsd) & BIT0) #define SET_VO_UAPSD(_apsd) ((_apsd) |= BIT0) @@ -296,19 +297,19 @@ union qos_tclas { } TYPE2_8021Q; }; -typedef struct _QOS_TSTREAM{ +struct qos_tstream { bool bUsed; u16 MsduLifetime; bool bEstablishing; u8 TimeSlotCount; u8 DialogToken; - WMM_TSPEC TSpec; - WMM_TSPEC OutStandingTSpec; + struct wmm_tspec TSpec; + struct wmm_tspec OutStandingTSpec; u8 NominalPhyRate; -} QOS_TSTREAM, *PQOS_TSTREAM; +}; -typedef struct _STA_QOS{ +struct sta_qos { u8 WMMIEBuf[MAX_WMMELE_LENGTH]; u8* WMMIE; @@ -324,12 +325,12 @@ typedef struct _STA_QOS{ u8 * pWMMInfoEle; u8 WMMParamEle[WMM_PARAM_ELEMENT_SIZE]; - ACM acm[4]; + struct acm acm[4]; enum acm_method AcmMethod; - QOS_TSTREAM StaTsArray[MAX_STA_TS_COUNT]; + struct qos_tstream StaTsArray[MAX_STA_TS_COUNT]; u8 DialogToken; - WMM_TSPEC TSpec; + struct wmm_tspec TSpec; u8 QBssWirelessMode; @@ -337,7 +338,7 @@ typedef struct _STA_QOS{ bool bEnableRxImmBA; -}STA_QOS, *PSTA_QOS; +}; #define QBSS_LOAD_SIZE 5 #define GET_QBSS_LOAD_STA_COUNT(__pStart) ReadEF2Byte(__pStart) @@ -347,11 +348,11 @@ typedef struct _STA_QOS{ #define GET_QBSS_LOAD_AVAILABLE_CAPACITY(__pStart) ReadEF2Byte((u8*)(__pStart) + 3) #define SET_QBSS_LOAD_AVAILABLE_CAPACITY(__pStart, __Value) WriteEF2Byte((u8*)(__pStart) + 3, __Value) -typedef struct _BSS_QOS{ +struct bss_qos { u32 bdQoSMode; u8 bdWMMIEBuf[MAX_WMMELE_LENGTH]; - OCTET_STRING bdWMMIE; + struct octet_string bdWMMIE; enum qoselesubtype EleSubType; @@ -360,7 +361,7 @@ typedef struct _BSS_QOS{ u8 QBssLoad[QBSS_LOAD_SIZE]; bool bQBssLoadValid; -}BSS_QOS, *PBSS_QOS; +}; #define sQoSCtlLng 2 #define QOS_CTRL_LEN(_QosMode) ( (_QosMode > QOS_DISABLE)? sQoSCtlLng : 0 ) Index: staging-2.6/drivers/staging/rtl8192e/rtl819x_TS.h =================================================================== --- staging-2.6.orig/drivers/staging/rtl8192e/rtl819x_TS.h +++ staging-2.6/drivers/staging/rtl8192e/rtl819x_TS.h @@ -31,7 +31,7 @@ enum tr_select { RX_DIR = 1, }; -typedef struct _TS_COMMON_INFO{ +struct ts_common_info { struct list_head List; struct timer_list SetupTimer; struct timer_list InactTimer; @@ -40,10 +40,10 @@ typedef struct _TS_COMMON_INFO{ union qos_tclas TClass[TCLAS_NUM]; u8 TClasProc; u8 TClasNum; -} TS_COMMON_INFO, *PTS_COMMON_INFO; +}; -typedef struct _TX_TS_RECORD{ - TS_COMMON_INFO TsCommonInfo; +struct tx_ts_record { + struct ts_common_info TsCommonInfo; u16 TxCurSeq; struct ba_record TxPendingBARecord; struct ba_record TxAdmittedBARecord; @@ -53,10 +53,10 @@ typedef struct _TX_TS_RECORD{ u8 bDisable_AddBa; struct timer_list TsAddBaTimer; u8 num; -} TX_TS_RECORD, *PTX_TS_RECORD; +}; -typedef struct _RX_TS_RECORD { - TS_COMMON_INFO TsCommonInfo; +struct rx_ts_record { + struct ts_common_info TsCommonInfo; u16 RxIndicateSeq; u16 RxTimeoutIndicateSeq; struct list_head RxPendingPktList; @@ -65,7 +65,7 @@ typedef struct _RX_TS_RECORD { u16 RxLastSeqNum; u8 RxLastFragNum; u8 num; -} RX_TS_RECORD, *PRX_TS_RECORD; +}; #endif Index: staging-2.6/drivers/staging/rtl8192e/rtl819x_TSProc.c =================================================================== --- staging-2.6.orig/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ staging-2.6/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -31,7 +31,7 @@ void TsInactTimeout(unsigned long data) void RxPktPendingTimeout(unsigned long data) { - PRX_TS_RECORD pRxTs = (PRX_TS_RECORD)data; + struct rx_ts_record *pRxTs = (struct rx_ts_record *)data; struct rtllib_device *ieee = container_of(pRxTs, struct rtllib_device, RxTsRecord[pRxTs->num]); struct rx_reorder_entry *pReorderEntry = NULL; @@ -95,7 +95,7 @@ void RxPktPendingTimeout(unsigned long d void TsAddBaProcess(unsigned long data) { - PTX_TS_RECORD pTxTs = (PTX_TS_RECORD)data; + struct tx_ts_record *pTxTs = (struct tx_ts_record *)data; u8 num = pTxTs->num; struct rtllib_device *ieee = container_of(pTxTs, struct rtllib_device, TxTsRecord[num]); @@ -104,7 +104,7 @@ void TsAddBaProcess(unsigned long data) } -void ResetTsCommonInfo(PTS_COMMON_INFO pTsCommonInfo) +void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo) { memset(pTsCommonInfo->Addr, 0, 6); memset(&pTsCommonInfo->TSpec, 0, sizeof(union tspec_body)); @@ -113,7 +113,7 @@ void ResetTsCommonInfo(PTS_COMMON_INFO p pTsCommonInfo->TClasNum = 0; } -void ResetTxTsEntry(PTX_TS_RECORD pTS) +void ResetTxTsEntry(struct tx_ts_record *pTS) { ResetTsCommonInfo(&pTS->TsCommonInfo); pTS->TxCurSeq = 0; @@ -125,7 +125,7 @@ void ResetTxTsEntry(PTX_TS_RECORD pTS) ResetBaEntry(&pTS->TxPendingBARecord); } -void ResetRxTsEntry(PRX_TS_RECORD pTS) +void ResetRxTsEntry(struct rx_ts_record *pTS) { ResetTsCommonInfo(&pTS->TsCommonInfo); pTS->RxIndicateSeq = 0xffff; @@ -135,8 +135,8 @@ void ResetRxTsEntry(PRX_TS_RECORD pTS) void TSInitialize(struct rtllib_device *ieee) { - PTX_TS_RECORD pTxTS = ieee->TxTsRecord; - PRX_TS_RECORD pRxTS = ieee->RxTsRecord; + struct tx_ts_record *pTxTS = ieee->TxTsRecord; + struct rx_ts_record *pRxTS = ieee->RxTsRecord; struct rx_reorder_entry *pRxReorderEntry = ieee->RxReorderEntry; u8 count = 0; RTLLIB_DEBUG(RTLLIB_DL_TS, "==========>%s()\n", __func__); @@ -211,7 +211,8 @@ void TSInitialize(struct rtllib_device * } -void AdmitTS(struct rtllib_device *ieee, PTS_COMMON_INFO pTsCommonInfo, u32 InactTime) +void AdmitTS(struct rtllib_device *ieee, struct ts_common_info *pTsCommonInfo, + u32 InactTime) { del_timer_sync(&pTsCommonInfo->SetupTimer); del_timer_sync(&pTsCommonInfo->InactTimer); @@ -221,13 +222,13 @@ void AdmitTS(struct rtllib_device *ieee, } -PTS_COMMON_INFO SearchAdmitTRStream(struct rtllib_device *ieee, u8 *Addr, - u8 TID, enum tr_select TxRxSelect) +struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ieee, u8 *Addr, + u8 TID, enum tr_select TxRxSelect) { u8 dir; bool search_dir[4] = {0, 0, 0, 0}; struct list_head* psearch_list; - PTS_COMMON_INFO pRet = NULL; + struct ts_common_info *pRet = NULL; if (ieee->iw_mode == IW_MODE_MASTER) { if (TxRxSelect == TX_DIR) @@ -293,14 +294,9 @@ PTS_COMMON_INFO SearchAdmitTRStream(stru return NULL; } -void MakeTSEntry( - PTS_COMMON_INFO pTsCommonInfo, - u8* Addr, - union tspec_body *pTSPEC, - union qos_tclas *pTCLAS, - u8 TCLAS_Num, - u8 TCLAS_Proc - ) +void MakeTSEntry(struct ts_common_info *pTsCommonInfo, u8 *Addr, + union tspec_body *pTSPEC, union qos_tclas *pTCLAS, + u8 TCLAS_Num, u8 TCLAS_Proc) { u8 count; @@ -321,7 +317,7 @@ void MakeTSEntry( pTsCommonInfo->TClasNum = TCLAS_Num; } -bool GetTs(struct rtllib_device *ieee, PTS_COMMON_INFO *ppTS, +bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, u8 *Addr, u8 TID, enum tr_select TxRxSelect, bool bAddNewTs) { u8 UP = 0; @@ -395,15 +391,20 @@ bool GetTs(struct rtllib_device *ieee, P RTLLIB_DEBUG(RTLLIB_DL_TS, "to add Ts\n"); if (!list_empty(pUnusedList)) { - (*ppTS) = list_entry(pUnusedList->next, TS_COMMON_INFO, List); + (*ppTS) = list_entry(pUnusedList->next, struct ts_common_info, List); list_del_init(&(*ppTS)->List); if (TxRxSelect==TX_DIR) { - PTX_TS_RECORD tmp = container_of(*ppTS, TX_TS_RECORD, TsCommonInfo); + struct tx_ts_record *tmp = container_of + (*ppTS, struct tx_ts_record, + TsCommonInfo); ResetTxTsEntry(tmp); } else{ - PRX_TS_RECORD tmp = container_of(*ppTS, RX_TS_RECORD, TsCommonInfo); + struct rx_ts_record *tmp = + container_of(*ppTS, + struct rx_ts_record, + TsCommonInfo); ResetRxTsEntry(tmp); } @@ -433,7 +434,7 @@ bool GetTs(struct rtllib_device *ieee, P } } -void RemoveTsEntry(struct rtllib_device *ieee, PTS_COMMON_INFO pTs, +void RemoveTsEntry(struct rtllib_device *ieee, struct ts_common_info *pTs, enum tr_select TxRxSelect) { del_timer_sync(&pTs->SetupTimer); @@ -443,7 +444,7 @@ void RemoveTsEntry(struct rtllib_device if (TxRxSelect == RX_DIR) { struct rx_reorder_entry *pRxReorderEntry; - PRX_TS_RECORD pRxTS = (PRX_TS_RECORD)pTs; + struct rx_ts_record *pRxTS = (struct rx_ts_record *)pTs; if (timer_pending(&pRxTS->RxPktPendingTimer)) del_timer_sync(&pRxTS->RxPktPendingTimer); @@ -470,14 +471,14 @@ void RemoveTsEntry(struct rtllib_device } } else{ - PTX_TS_RECORD pTxTS = (PTX_TS_RECORD)pTs; + struct tx_ts_record *pTxTS = (struct tx_ts_record *)pTs; del_timer_sync(&pTxTS->TsAddBaTimer); } } void RemovePeerTS(struct rtllib_device* ieee, u8* Addr) { - PTS_COMMON_INFO pTS, pTmpTS; + struct ts_common_info *pTS, *pTmpTS; printk("===========>RemovePeerTS,"MAC_FMT"\n", MAC_ARG(Addr)); list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List) @@ -524,7 +525,7 @@ void RemovePeerTS(struct rtllib_device* void RemoveAllTS(struct rtllib_device* ieee) { - PTS_COMMON_INFO pTS, pTmpTS; + struct ts_common_info *pTS, *pTmpTS; list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List) { @@ -555,7 +556,7 @@ void RemoveAllTS(struct rtllib_device* i } } -void TsStartAddBaProcess(struct rtllib_device* ieee, PTX_TS_RECORD pTxTS) +void TsStartAddBaProcess(struct rtllib_device* ieee, struct tx_ts_record *pTxTS) { if (pTxTS->bAddBaReqInProgress == false) { Index: staging-2.6/drivers/staging/rtl8192e/rtl_core.h =================================================================== --- staging-2.6.orig/drivers/staging/rtl8192e/rtl_core.h +++ staging-2.6/drivers/staging/rtl8192e/rtl_core.h @@ -165,7 +165,7 @@ #define RTL_IOCTL_WPA_SUPPLICANT SIOCIWFIRSTPRIV+30 #define TxBBGainTableLength 37 -#define CCKTxBBGainTableLength 23 +#define CCKTxBBGainTL 23 #define CHANNEL_PLAN_LEN 10 #define sCrcLng 4 @@ -340,15 +340,14 @@ enum pci_bridge_vendor { PCI_BRIDGE_VENDOR_MAX , }; -typedef struct buffer -{ +struct buffer { struct buffer *next; u32 *buf; dma_addr_t dma; -} buffer; +}; -typedef struct rtl_reg_debug{ +struct rtl_reg_debug { unsigned int cmd; struct { unsigned char type; @@ -357,23 +356,22 @@ typedef struct rtl_reg_debug{ unsigned char length; } head; unsigned char buf[0xff]; -}rtl_reg_debug; +}; -typedef struct _rt_9x_tx_rate_history { +struct rt_tx_rahis_t { u32 cck[4]; u32 ofdm[8]; u32 ht_mcs[4][16]; -}rt_tx_rahis_t, *prt_tx_rahis_t; +}; -typedef struct _RT_SMOOTH_DATA_4RF { +struct rt_smooth_data_4rf { char elements[4][100]; u32 index; u32 TotalNum; u32 TotalVal[4]; -}RT_SMOOTH_DATA_4RF, *PRT_SMOOTH_DATA_4RF; +}; -typedef struct Stats -{ +struct Stats { unsigned long txrdu; unsigned long rxrdu; unsigned long rxok; @@ -461,21 +459,21 @@ typedef struct Stats u8 rx_rssi_percentage[4]; u8 rx_evm_percentage[2]; long rxSNRdB[4]; - rt_tx_rahis_t txrate; + struct rt_tx_rahis_t txrate; u32 Slide_Beacon_pwdb[100]; u32 Slide_Beacon_Total; - RT_SMOOTH_DATA_4RF cck_adc_pwdb; + struct rt_smooth_data_4rf cck_adc_pwdb; u32 CurrentShowTxate; -} Stats; +}; -typedef struct ChnlAccessSetting { +struct channel_access_setting { u16 SIFS_Timer; u16 DIFS_Timer; u16 SlotTimeTimer; u16 EIFS_Timer; u16 CWminIndex; u16 CWmaxIndex; -}*PCHANNEL_ACCESS_SETTING,CHANNEL_ACCESS_SETTING; +}; enum two_port_status { TWO_PORT_STATUS__DEFAULT_ONLY, @@ -486,32 +484,29 @@ enum two_port_status { TWO_PORT_STATUS__WITHOUT_ANY_ASSOCIATE }; -typedef struct _txbbgain_struct -{ +struct txbbgain_struct { long txbb_iq_amplifygain; u32 txbbgain_value; -} txbbgain_struct, *ptxbbgain_struct; +}; -typedef struct _ccktxbbgain_struct -{ +struct ccktxbbgain_struct { u8 ccktxbb_valuearray[8]; -} ccktxbbgain_struct,*pccktxbbgain_struct; +}; -typedef struct _init_gain -{ +struct init_gain { u8 xaagccore1; u8 xbagccore1; u8 xcagccore1; u8 xdagccore1; u8 cca; -} init_gain, *pinit_gain; +}; -typedef struct _tx_ring{ +struct tx_ring { u32 * desc; u8 nStuckCount; struct _tx_ring * next; -}__attribute__ ((packed)) tx_ring, * ptx_ring; +}__packed; struct rtl8192_tx_ring { struct tx_desc *desc; @@ -557,8 +552,7 @@ struct rtl819x_ops{ bool (* RxCheckStuckHandler)(struct net_device* dev); }; -typedef struct r8192_priv -{ +struct r8192_priv { struct pci_dev *pdev; struct pci_dev *bridge_pdev; @@ -585,7 +579,7 @@ typedef struct r8192_priv struct workqueue_struct *priv_wq; - CHANNEL_ACCESS_SETTING ChannelAccessSetting; + struct channel_access_setting ChannelAccessSetting; struct mp_adapter NdisAdapter; @@ -605,10 +599,10 @@ typedef struct r8192_priv struct bb_register_definition PHYRegDef[4]; struct rate_adaptive rate_adaptive; - ccktxbbgain_struct cck_txbbgain_table[CCKTxBBGainTableLength]; - ccktxbbgain_struct cck_txbbgain_ch14_table[CCKTxBBGainTableLength]; + struct ccktxbbgain_struct cck_txbbgain_table[CCKTxBBGainTL]; + struct ccktxbbgain_struct cck_txbbgain_ch14_table[CCKTxBBGainTL]; - txbbgain_struct txbbgain_table[TxBBGainTableLength]; + struct txbbgain_struct txbbgain_table[TxBBGainTableLength]; enum acm_method AcmMethod; @@ -957,7 +951,7 @@ typedef struct r8192_priv u8 Record_CCK_20Mindex; u8 Record_CCK_40Mindex; - init_gain initgain_backup; + struct init_gain initgain_backup; u8 DefaultInitialGain[4]; bool bis_any_nonbepkts; bool bcurrent_turbo_EDCA; @@ -1027,7 +1021,7 @@ typedef struct r8192_priv u8 H2CTxCmdSeq; -}r8192_priv; +}; extern const struct ethtool_ops rtl819x_ethtool_ops; @@ -1109,7 +1103,7 @@ MgntActSet_RF_State( bool ProtectOrNot ); void ActUpdateChannelAccessSetting(struct net_device *dev, - enum wireless_mode WirelessMode, - PCHANNEL_ACCESS_SETTING ChnlAccessSetting); + enum wireless_mode WirelessMode, + struct channel_access_setting *ChnlAccessSetting); #endif Index: staging-2.6/drivers/staging/rtl8192e/rtl_debug.h =================================================================== --- staging-2.6.orig/drivers/staging/rtl8192e/rtl_debug.h +++ staging-2.6/drivers/staging/rtl8192e/rtl_debug.h @@ -256,15 +256,14 @@ do { if (rt_global_debug_component & com } \ } while (0) -typedef struct _rtl_fs_debug -{ +struct rtl_fs_debug { const char *name; struct dentry *dir_drv; struct dentry *debug_register; u32 hw_type; u32 hw_offset; bool hw_holding; -} rtl_fs_debug; +}; void print_buffer(u32 *buffer, int len); void dump_eprom(struct net_device *dev); Index: staging-2.6/drivers/staging/rtl8192e/rtl_dm.c =================================================================== --- staging-2.6.orig/drivers/staging/rtl8192e/rtl_dm.c +++ staging-2.6/drivers/staging/rtl8192e/rtl_dm.c @@ -64,9 +64,9 @@ static u32 edca_setting_UL[HT_IOT_PEER_M /*------------------------Define global variable-----------------------------*/ -dig_t dm_digtable; +struct dig_t dm_digtable; u8 dm_shadow[16][256] = {{0}}; -DRxPathSel DM_RxPathSelTable; +struct DRxPathSel DM_RxPathSelTable; /*------------------------Define global variable-----------------------------*/ @@ -509,7 +509,7 @@ static void dm_TXPowerTrackingCallback_T { struct r8192_priv *priv = rtllib_priv(dev); bool bHighpowerstate, viviflag = false; - DCMD_TXCMD_T tx_cmd; + struct dcmd_txcmd_t tx_cmd; u8 powerlevelOFDM24G; int i =0, j = 0, k = 0; u8 RF_Type, tmp_report[5]={0, 0, 0, 0, 0}; @@ -536,7 +536,8 @@ static void dm_TXPowerTrackingCallback_T tx_cmd.Op = TXCMD_SET_TX_PWR_TRACKING; tx_cmd.Length = 4; tx_cmd.Value = Value; - cmpk_message_handle_tx(dev, (u8*)&tx_cmd, DESC_PACKET_TYPE_INIT, sizeof(DCMD_TXCMD_T)); + cmpk_message_handle_tx(dev, (u8*)&tx_cmd, DESC_PACKET_TYPE_INIT, + sizeof(struct dcmd_txcmd_t)); mdelay(1); for (i = 0;i <= 30; i++) { @@ -729,12 +730,12 @@ static void dm_TXPowerTrackingCallback_T priv->CCKPresentAttentuation = priv->CCKPresentAttentuation_40Mdefault + priv->CCKPresentAttentuation_difference; - if (priv->CCKPresentAttentuation > (CCKTxBBGainTableLength-1)) - priv->CCKPresentAttentuation = CCKTxBBGainTableLength-1; + if (priv->CCKPresentAttentuation > (CCKTxBBGainTL - 1)) + priv->CCKPresentAttentuation = CCKTxBBGainTL - 1; if (priv->CCKPresentAttentuation < 0) priv->CCKPresentAttentuation = 0; - if (priv->CCKPresentAttentuation > -1&&priv->CCKPresentAttentuation < CCKTxBBGainTableLength) + if (priv->CCKPresentAttentuation > -1&&priv->CCKPresentAttentuation < CCKTxBBGainTL) { if (priv->rtllib->current_network.channel == 14 && !priv->bcck_in_ch14) { @@ -3459,7 +3460,7 @@ static void dm_check_txrateandretrycount static void dm_send_rssi_tofw(struct net_device *dev) { - DCMD_TXCMD_T tx_cmd; + struct dcmd_txcmd_t tx_cmd; struct r8192_priv *priv = rtllib_priv(dev); write_nic_byte(dev, DRIVER_RSSI, (u8)priv->undecorated_smoothed_pwdb); @@ -3468,8 +3469,9 @@ static void dm_send_rssi_tofw(struct net tx_cmd.Length = 4; tx_cmd.Value = priv->undecorated_smoothed_pwdb; - cmpk_message_handle_tx(dev, (u8*)&tx_cmd, - DESC_PACKET_TYPE_INIT, sizeof(DCMD_TXCMD_T)); + cmpk_message_handle_tx(dev, (u8 *)&tx_cmd, + DESC_PACKET_TYPE_INIT, + sizeof(struct dcmd_txcmd_t)); } /*---------------------------Define function prototype------------------------*/ Index: staging-2.6/drivers/staging/rtl8192e/rtl_dm.h =================================================================== --- staging-2.6.orig/drivers/staging/rtl8192e/rtl_dm.h +++ staging-2.6/drivers/staging/rtl8192e/rtl_dm.h @@ -84,8 +84,7 @@ /*------------------------------Define structure----------------------------*/ -typedef struct _dynamic_initial_gain_threshold_ -{ +struct dig_t { u8 dig_enable_flag; u8 dig_algorithm; u8 Dig_TwoPort_Algorithm; @@ -126,7 +125,7 @@ typedef struct _dynamic_initial_gain_thr bool initialgain_lowerbound_state; long rssi_val; -}dig_t; +}; enum dm_dig_sta { DM_STA_DIG_OFF = 0, @@ -210,8 +209,7 @@ enum dm_dig_cs_ratio { DIG_CS_MAX }; -typedef struct _Dynamic_Rx_Path_Selection_ -{ +struct DRxPathSel { u8 Enable; u8 DbgMode; u8 cck_method; @@ -225,7 +223,7 @@ typedef struct _Dynamic_Rx_Path_Selectio u8 rf_rssi[4]; u8 rf_enable_rssi_th[4]; long cck_pwdb_sta[4]; -}DRxPathSel; +}; enum dm_cck_rx_path_method { CCK_Rx_Version_1 = 0, @@ -239,19 +237,18 @@ enum dm_dbg { DM_DBG_MAX }; -typedef struct tag_Tx_Config_Cmd_Format -{ +struct dcmd_txcmd_t { u32 Op; u32 Length; u32 Value; -}DCMD_TXCMD_T, *PDCMD_TXCMD_T; +}; /*------------------------------Define structure----------------------------*/ /*------------------------Export global variable----------------------------*/ -extern dig_t dm_digtable; +extern struct dig_t dm_digtable; extern u8 dm_shadow[16][256]; -extern DRxPathSel DM_RxPathSelTable; +extern struct DRxPathSel DM_RxPathSelTable; extern u8 test_flag; /*------------------------Export global variable----------------------------*/ Index: staging-2.6/drivers/staging/rtl8192e/rtllib.h =================================================================== --- staging-2.6.orig/drivers/staging/rtl8192e/rtllib.h +++ staging-2.6/drivers/staging/rtl8192e/rtllib.h @@ -1876,14 +1876,14 @@ struct rt_power_save_control { bool bTmpFilterHiddenAP; bool bTmpUpdateParms; u8 tmpSsidBuf[33]; - OCTET_STRING tmpSsid2Scan; + struct octet_string tmpSsid2Scan; bool bTmpSsid2Scan; u8 tmpNetworkType; u8 tmpChannelNumber; u16 tmpBcnPeriod; u8 tmpDtimPeriod; u16 tmpmCap; - OCTET_STRING tmpSuppRateSet; + struct octet_string tmpSuppRateSet; u8 tmpSuppRateBuf[MAX_NUM_RATES]; bool bTmpSuppRate; struct ibss_parms tmpIbpm; @@ -2155,11 +2155,11 @@ struct rtllib_device { struct list_head Tx_TS_Admit_List; struct list_head Tx_TS_Pending_List; struct list_head Tx_TS_Unused_List; - TX_TS_RECORD TxTsRecord[TOTAL_TS_NUM]; + struct tx_ts_record TxTsRecord[TOTAL_TS_NUM]; struct list_head Rx_TS_Admit_List; struct list_head Rx_TS_Pending_List; struct list_head Rx_TS_Unused_List; - RX_TS_RECORD RxTsRecord[TOTAL_TS_NUM]; + struct rx_ts_record RxTsRecord[TOTAL_TS_NUM]; struct rx_reorder_entry RxReorderEntry[128]; struct list_head RxReorder_Unused_List; u8 ForcedPriority; @@ -2914,22 +2914,24 @@ extern u16 TxCountToDataRate( struct rt extern int rtllib_rx_ADDBAReq( struct rtllib_device* ieee, struct sk_buff *skb); extern int rtllib_rx_ADDBARsp( struct rtllib_device* ieee, struct sk_buff *skb); extern int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb); -extern void TsInitAddBA( struct rtllib_device* ieee, PTX_TS_RECORD pTS, u8 Policy, u8 bOverwritePending); -extern void TsInitDelBA( struct rtllib_device* ieee, PTS_COMMON_INFO pTsCommonInfo, enum tr_select TxRxSelect); +extern void TsInitAddBA(struct rtllib_device *ieee, struct tx_ts_record *pTS, + u8 Policy, u8 bOverwritePending); +extern void TsInitDelBA( struct rtllib_device* ieee, struct ts_common_info *pTsCommonInfo, enum tr_select TxRxSelect); extern void BaSetupTimeOut(unsigned long data); extern void TxBaInactTimeout(unsigned long data); extern void RxBaInactTimeout(unsigned long data); extern void ResetBaEntry(struct ba_record *pBA); extern bool GetTs( struct rtllib_device* ieee, - PTS_COMMON_INFO *ppTS, + struct ts_common_info **ppTS, u8* Addr, u8 TID, enum tr_select TxRxSelect, bool bAddNewTs ); extern void TSInitialize(struct rtllib_device *ieee); -extern void TsStartAddBaProcess(struct rtllib_device* ieee, PTX_TS_RECORD pTxTS); +extern void TsStartAddBaProcess(struct rtllib_device *ieee, + struct tx_ts_record *pTxTS); extern void RemovePeerTS(struct rtllib_device* ieee, u8* Addr); extern void RemoveAllTS(struct rtllib_device* ieee); void rtllib_softmac_scan_syncro(struct rtllib_device *ieee, u8 is_mesh); @@ -2994,7 +2996,8 @@ bool rtllib_MgntDisconnect(struct rtllib * ieee handler to refer to it. */ extern void rtllib_update_active_chan_map(struct rtllib_device *ieee); -extern void rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee, PRX_TS_RECORD pTS); +extern void rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee, + struct rx_ts_record *pTS); extern int rtllib_data_xmit(struct sk_buff *skb, struct net_device *dev); extern int rtllib_parse_info_param(struct rtllib_device *ieee, struct rtllib_info_element *info_element, Index: staging-2.6/drivers/staging/rtl8192e/rtllib_rx.c =================================================================== --- staging-2.6.orig/drivers/staging/rtl8192e/rtllib_rx.c +++ staging-2.6/drivers/staging/rtl8192e/rtllib_rx.c @@ -448,7 +448,7 @@ drop: return 1; } -bool AddReorderEntry(PRX_TS_RECORD pTS, +bool AddReorderEntry(struct rx_ts_record *pTS, struct rx_reorder_entry *pReorderEntry) { struct list_head *pList = &pTS->RxPendingPktList; @@ -530,7 +530,8 @@ void rtllib_indicate_packets(struct rtll } void -rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee, PRX_TS_RECORD pTS) +rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee, + struct rx_ts_record *pTS) { struct rx_reorder_entry *pRxReorderEntry; struct rtllib_rxb* RfdArray[REORDER_WIN_SIZE]; @@ -562,10 +563,10 @@ rtllib_FlushRxTsPendingPkts(struct rtlli } -void RxReorderIndicatePacket( struct rtllib_device *ieee, - struct rtllib_rxb* prxb, - PRX_TS_RECORD pTS, - u16 SeqNum) +void RxReorderIndicatePacket(struct rtllib_device *ieee, + struct rtllib_rxb *prxb, + struct rx_ts_record *pTS, + u16 SeqNum) { struct ht_high_througlput *pHTInfo = ieee->pHTInfo; struct rx_reorder_entry *pReorderEntry = NULL; @@ -905,8 +906,8 @@ int rtllib_rx_check_duplicate(struct rtl } } } else { - PRX_TS_RECORD pRxTS = NULL; - if (GetTs(ieee, (PTS_COMMON_INFO*) &pRxTS, hdr->addr2, + struct rx_ts_record *pRxTS = NULL; + if (GetTs(ieee, (struct ts_common_info **) &pRxTS, hdr->addr2, (u8)Frame_QoSTID((u8*)(skb->data)), RX_DIR, true)) { if ((fc & (1<<11)) && (frag == pRxTS->RxLastFragNum) && (WLAN_GET_SEQ_SEQ(sc) == pRxTS->RxLastSeqNum)) { @@ -1262,7 +1263,7 @@ int rtllib_rx_InfraAdhoc(struct rtllib_d struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data; struct rtllib_crypt_data *crypt = NULL; struct rtllib_rxb* rxb = NULL; - PRX_TS_RECORD pTS = NULL; + struct rx_ts_record *pTS = NULL; u16 fc, sc, SeqNum = 0; u8 type, stype, multicast = 0, unicast = 0, nr_subframes = 0, TID = 0; u8 dst[ETH_ALEN], src[ETH_ALEN], bssid[ETH_ALEN] = {0}, *payload; @@ -1365,7 +1366,8 @@ int rtllib_rx_InfraAdhoc(struct rtllib_d { TID = Frame_QoSTID(skb->data); SeqNum = WLAN_GET_SEQ_SEQ(sc); - GetTs(ieee,(PTS_COMMON_INFO*) &pTS,hdr->addr2,TID,RX_DIR,true); + GetTs(ieee, (struct ts_common_info **) &pTS,hdr->addr2, TID, + RX_DIR, true); if (TID !=0 && TID !=3){ ieee->bis_any_nonbepkts = true; } Index: staging-2.6/drivers/staging/rtl8192e/rtllib_softmac.c =================================================================== --- staging-2.6.orig/drivers/staging/rtl8192e/rtllib_softmac.c +++ staging-2.6/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1351,7 +1351,7 @@ inline struct sk_buff *rtllib_associatio { static u8 AironetIeOui[] = {0x00, 0x01, 0x66}; u8 CcxAironetBuf[30]; - OCTET_STRING osCcxAironetIE; + struct octet_string osCcxAironetIE; memset(CcxAironetBuf, 0,30); osCcxAironetIE.Octet = CcxAironetBuf; @@ -1369,7 +1369,7 @@ inline struct sk_buff *rtllib_associatio if (beacon->bCcxRmEnable) { static u8 CcxRmCapBuf[] = {0x00, 0x40, 0x96, 0x01, 0x01, 0x00}; - OCTET_STRING osCcxRmCap; + struct octet_string osCcxRmCap; osCcxRmCap.Octet = CcxRmCapBuf; osCcxRmCap.Length = sizeof(CcxRmCapBuf); @@ -1383,7 +1383,7 @@ inline struct sk_buff *rtllib_associatio if ( beacon->BssCcxVerNumber >= 2 ) { u8 CcxVerNumBuf[] = {0x00, 0x40, 0x96, 0x03, 0x00}; - OCTET_STRING osCcxVerNum; + struct octet_string osCcxVerNum; CcxVerNumBuf[4] = beacon->BssCcxVerNumber; osCcxVerNum.Octet = CcxVerNumBuf; osCcxVerNum.Length = sizeof(CcxVerNumBuf); Index: staging-2.6/drivers/staging/rtl8192e/rtllib_tx.c =================================================================== --- staging-2.6.orig/drivers/staging/rtl8192e/rtllib_tx.c +++ staging-2.6/drivers/staging/rtl8192e/rtllib_tx.c @@ -291,7 +291,7 @@ void rtllib_tx_query_agg_cap(struct rtll struct sk_buff *skb, struct cb_desc *tcb_desc) { struct ht_high_througlput *pHTInfo = ieee->pHTInfo; - PTX_TS_RECORD pTxTs = NULL; + struct tx_ts_record *pTxTs = NULL; struct rtllib_hdr_1addr* hdr = (struct rtllib_hdr_1addr*)skb->data; if (rtllib_act_scanning(ieee,false)) @@ -313,7 +313,8 @@ void rtllib_tx_query_agg_cap(struct rtll if (!ieee->GetNmodeSupportBySecCfg(ieee->dev)) return; if (pHTInfo->bCurrentAMPDUEnable){ - if (!GetTs(ieee, (PTS_COMMON_INFO*)(&pTxTs), hdr->addr1, skb->priority, TX_DIR, true)){ + if (!GetTs(ieee, (struct ts_common_info **)(&pTxTs), hdr->addr1, + skb->priority, TX_DIR, true)){ printk("%s: can't get TS\n", __func__); return; } @@ -540,8 +541,9 @@ u16 rtllib_query_seqnum(struct rtllib_de return 0; if (IsQoSDataFrame(skb->data)) { - PTX_TS_RECORD pTS = NULL; - if (!GetTs(ieee, (PTS_COMMON_INFO*)(&pTS), dst, skb->priority, TX_DIR, true)) + struct tx_ts_record *pTS = NULL; + if (!GetTs(ieee, (struct ts_common_info **)(&pTS), dst, + skb->priority, TX_DIR, true)) { return 0; } _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel