redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: rtl8192e: Convert typedef TX_TS_RECORD to struct tx_ts_record

Browse source 
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2011-07-18 20:10:03 -05:00
parent 0157d2e55c
commit 60554f2bdb
5 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/staging/rtl8192e/rtl819x_BAProc.c
View file

@ -32,7 +32,7 @@ void DeActivateBAEntry( struct rtllib_device* ieee, PBA_RECORD pBA)
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)
{
PBA_RECORD pAdmittedBa = &pTxTs->TxAdmittedBARecord;
PBA_RECORD pPendingBa = &pTxTs->TxPendingBARecord;
@ -329,7 +329,7 @@ int rtllib_rx_ADDBARsp( struct rtllib_device* ieee, struct sk_buff *skb)
{
struct rtllib_hdr_3addr* rsp = NULL;
PBA_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;
PBA_PARAM_SET pBaParamSet = NULL;
@ -475,7 +475,7 @@ int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb)
}
else
{
PTX_TS_RECORD pTxTs;
struct tx_ts_record *pTxTs;
if (!GetTs(
ieee,
@ -501,7 +501,7 @@ int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb)
void
TsInitAddBA(
struct rtllib_device* ieee,
PTX_TS_RECORD pTS,
struct tx_ts_record *pTS,
u8 Policy,
u8 bOverwritePending
)
@ -532,7 +532,7 @@ TsInitDelBA( struct rtllib_device* ieee, PTS_COMMON_INFO pTsCommonInfo, TR_SELEC
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(
@ -556,7 +556,7 @@ TsInitDelBA( struct rtllib_device* ieee, PTS_COMMON_INFO pTsCommonInfo, TR_SELEC
}
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;
@ -565,7 +565,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(

4
drivers/staging/rtl8192e/rtl819x_TS.h
View file

@ -42,7 +42,7 @@ typedef struct _TS_COMMON_INFO{
u8 TClasNum;
} TS_COMMON_INFO, *PTS_COMMON_INFO;
typedef struct _TX_TS_RECORD{
struct tx_ts_record {
TS_COMMON_INFO TsCommonInfo;
u16 TxCurSeq;
BA_RECORD TxPendingBARecord;
@ -53,7 +53,7 @@ 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;

12
drivers/staging/rtl8192e/rtl819x_TSProc.c
View file

@ -93,7 +93,7 @@ void RxPktPendingTimeout(unsigned long data)
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]);
@ -111,7 +111,7 @@ void ResetTsCommonInfo(PTS_COMMON_INFO pTsCommonInfo)
pTsCommonInfo->TClasNum = 0;
}
void ResetTxTsEntry(PTX_TS_RECORD pTS)
void ResetTxTsEntry(struct tx_ts_record *pTS)
{
ResetTsCommonInfo(&pTS->TsCommonInfo);
pTS->TxCurSeq = 0;
@ -133,7 +133,7 @@ void ResetRxTsEntry(PRX_TS_RECORD pTS)
void TSInitialize(struct rtllib_device *ieee)
{
PTX_TS_RECORD pTxTS = ieee->TxTsRecord;
struct tx_ts_record *pTxTS = ieee->TxTsRecord;
PRX_TS_RECORD pRxTS = ieee->RxTsRecord;
PRX_REORDER_ENTRY pRxReorderEntry = ieee->RxReorderEntry;
u8 count = 0;
@ -398,7 +398,7 @@ bool GetTs(
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{
@ -470,7 +470,7 @@ void RemoveTsEntry(
}
}
else{
PTX_TS_RECORD pTxTS = (PTX_TS_RECORD)pTs;
struct tx_ts_record *pTxTS = (struct tx_ts_record *)pTs;
del_timer_sync(&pTxTS->TsAddBaTimer);
}
}
@ -555,7 +555,7 @@ void RemoveAllTS(struct rtllib_device* ieee)
}
}
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)
{

6
drivers/staging/rtl8192e/rtllib.h
View file

@ -2160,7 +2160,7 @@ 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;
@ -2913,7 +2913,7 @@ extern u16 TxCountToDataRate( struct rtllib_device* ieee, u8 nDataRate);
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 TsInitAddBA( struct rtllib_device* ieee, struct tx_ts_record *pTS, u8 Policy, u8 bOverwritePending);
extern void TsInitDelBA( struct rtllib_device* ieee, PTS_COMMON_INFO pTsCommonInfo, TR_SELECT TxRxSelect);
extern void BaSetupTimeOut(unsigned long data);
extern void TxBaInactTimeout(unsigned long data);
@ -2928,7 +2928,7 @@ extern bool GetTs(
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);

4
drivers/staging/rtl8192e/rtllib_tx.c
View file

@ -290,7 +290,7 @@ rtllib_classify(struct sk_buff *skb, u8 bIsAmsdu)
void rtllib_tx_query_agg_cap(struct rtllib_device* ieee, struct sk_buff* skb, cb_desc* tcb_desc)
{
PRT_HIGH_THROUGHPUT 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))
@ -535,7 +535,7 @@ u16 rtllib_query_seqnum(struct rtllib_device*ieee, struct sk_buff* skb, u8* dst)
return 0;
if (IsQoSDataFrame(skb->data))
{
PTX_TS_RECORD pTS = NULL;
struct tx_ts_record *pTS = NULL;
if (!GetTs(ieee, (PTS_COMMON_INFO*)(&pTS), dst, skb->priority, TX_DIR, true))
{
return 0;