Commit 60554f2b authored by Larry Finger's avatar Larry Finger

staging: rtl8192e: Convert typedef TX_TS_RECORD to struct tx_ts_record

Remove typedef from struct.
Rename struct.
Rename uses.
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent 0157d2e5
...@@ -32,7 +32,7 @@ void DeActivateBAEntry( struct rtllib_device* ieee, PBA_RECORD pBA) ...@@ -32,7 +32,7 @@ void DeActivateBAEntry( struct rtllib_device* ieee, PBA_RECORD pBA)
pBA->bValid = false; pBA->bValid = false;
del_timer_sync(&pBA->Timer); 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 pAdmittedBa = &pTxTs->TxAdmittedBARecord;
PBA_RECORD pPendingBa = &pTxTs->TxPendingBARecord; PBA_RECORD pPendingBa = &pTxTs->TxPendingBARecord;
...@@ -329,7 +329,7 @@ int rtllib_rx_ADDBARsp( struct rtllib_device* ieee, struct sk_buff *skb) ...@@ -329,7 +329,7 @@ int rtllib_rx_ADDBARsp( struct rtllib_device* ieee, struct sk_buff *skb)
{ {
struct rtllib_hdr_3addr* rsp = NULL; struct rtllib_hdr_3addr* rsp = NULL;
PBA_RECORD pPendingBA, pAdmittedBA; PBA_RECORD pPendingBA, pAdmittedBA;
PTX_TS_RECORD pTS = NULL; struct tx_ts_record *pTS = NULL;
u8* dst = NULL, *pDialogToken = NULL, *tag = NULL; u8* dst = NULL, *pDialogToken = NULL, *tag = NULL;
u16* pStatusCode = NULL, *pBaTimeoutVal = NULL; u16* pStatusCode = NULL, *pBaTimeoutVal = NULL;
PBA_PARAM_SET pBaParamSet = NULL; PBA_PARAM_SET pBaParamSet = NULL;
...@@ -475,7 +475,7 @@ int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb) ...@@ -475,7 +475,7 @@ int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb)
} }
else else
{ {
PTX_TS_RECORD pTxTs; struct tx_ts_record *pTxTs;
if (!GetTs( if (!GetTs(
ieee, ieee,
...@@ -501,7 +501,7 @@ int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb) ...@@ -501,7 +501,7 @@ int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb)
void void
TsInitAddBA( TsInitAddBA(
struct rtllib_device* ieee, struct rtllib_device* ieee,
PTX_TS_RECORD pTS, struct tx_ts_record *pTS,
u8 Policy, u8 Policy,
u8 bOverwritePending u8 bOverwritePending
) )
...@@ -532,7 +532,7 @@ TsInitDelBA( struct rtllib_device* ieee, PTS_COMMON_INFO pTsCommonInfo, TR_SELEC ...@@ -532,7 +532,7 @@ TsInitDelBA( struct rtllib_device* ieee, PTS_COMMON_INFO pTsCommonInfo, TR_SELEC
if (TxRxSelect == TX_DIR) 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)) if (TxTsDeleteBA(ieee, pTxTs))
rtllib_send_DELBA( rtllib_send_DELBA(
...@@ -556,7 +556,7 @@ TsInitDelBA( struct rtllib_device* ieee, PTS_COMMON_INFO pTsCommonInfo, TR_SELEC ...@@ -556,7 +556,7 @@ TsInitDelBA( struct rtllib_device* ieee, PTS_COMMON_INFO pTsCommonInfo, TR_SELEC
} }
void BaSetupTimeOut(unsigned long data) 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->bAddBaReqInProgress = false;
pTxTs->bAddBaReqDelayed = true; pTxTs->bAddBaReqDelayed = true;
...@@ -565,7 +565,7 @@ void BaSetupTimeOut(unsigned long data) ...@@ -565,7 +565,7 @@ void BaSetupTimeOut(unsigned long data)
void TxBaInactTimeout(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]); struct rtllib_device *ieee = container_of(pTxTs, struct rtllib_device, TxTsRecord[pTxTs->num]);
TxTsDeleteBA(ieee, pTxTs); TxTsDeleteBA(ieee, pTxTs);
rtllib_send_DELBA( rtllib_send_DELBA(
......
...@@ -42,7 +42,7 @@ typedef struct _TS_COMMON_INFO{ ...@@ -42,7 +42,7 @@ typedef struct _TS_COMMON_INFO{
u8 TClasNum; u8 TClasNum;
} TS_COMMON_INFO, *PTS_COMMON_INFO; } TS_COMMON_INFO, *PTS_COMMON_INFO;
typedef struct _TX_TS_RECORD{ struct tx_ts_record {
TS_COMMON_INFO TsCommonInfo; TS_COMMON_INFO TsCommonInfo;
u16 TxCurSeq; u16 TxCurSeq;
BA_RECORD TxPendingBARecord; BA_RECORD TxPendingBARecord;
...@@ -53,7 +53,7 @@ typedef struct _TX_TS_RECORD{ ...@@ -53,7 +53,7 @@ typedef struct _TX_TS_RECORD{
u8 bDisable_AddBa; u8 bDisable_AddBa;
struct timer_list TsAddBaTimer; struct timer_list TsAddBaTimer;
u8 num; u8 num;
} TX_TS_RECORD, *PTX_TS_RECORD; };
typedef struct _RX_TS_RECORD { typedef struct _RX_TS_RECORD {
TS_COMMON_INFO TsCommonInfo; TS_COMMON_INFO TsCommonInfo;
......
...@@ -93,7 +93,7 @@ void RxPktPendingTimeout(unsigned long data) ...@@ -93,7 +93,7 @@ void RxPktPendingTimeout(unsigned long data)
void TsAddBaProcess(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; u8 num = pTxTs->num;
struct rtllib_device *ieee = container_of(pTxTs, struct rtllib_device, TxTsRecord[num]); struct rtllib_device *ieee = container_of(pTxTs, struct rtllib_device, TxTsRecord[num]);
...@@ -111,7 +111,7 @@ void ResetTsCommonInfo(PTS_COMMON_INFO pTsCommonInfo) ...@@ -111,7 +111,7 @@ void ResetTsCommonInfo(PTS_COMMON_INFO pTsCommonInfo)
pTsCommonInfo->TClasNum = 0; pTsCommonInfo->TClasNum = 0;
} }
void ResetTxTsEntry(PTX_TS_RECORD pTS) void ResetTxTsEntry(struct tx_ts_record *pTS)
{ {
ResetTsCommonInfo(&pTS->TsCommonInfo); ResetTsCommonInfo(&pTS->TsCommonInfo);
pTS->TxCurSeq = 0; pTS->TxCurSeq = 0;
...@@ -133,7 +133,7 @@ void ResetRxTsEntry(PRX_TS_RECORD pTS) ...@@ -133,7 +133,7 @@ void ResetRxTsEntry(PRX_TS_RECORD pTS)
void TSInitialize(struct rtllib_device *ieee) 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_TS_RECORD pRxTS = ieee->RxTsRecord;
PRX_REORDER_ENTRY pRxReorderEntry = ieee->RxReorderEntry; PRX_REORDER_ENTRY pRxReorderEntry = ieee->RxReorderEntry;
u8 count = 0; u8 count = 0;
...@@ -398,7 +398,7 @@ bool GetTs( ...@@ -398,7 +398,7 @@ bool GetTs(
list_del_init(&(*ppTS)->List); list_del_init(&(*ppTS)->List);
if (TxRxSelect==TX_DIR) 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); ResetTxTsEntry(tmp);
} }
else{ else{
...@@ -470,7 +470,7 @@ void RemoveTsEntry( ...@@ -470,7 +470,7 @@ void RemoveTsEntry(
} }
} }
else{ else{
PTX_TS_RECORD pTxTS = (PTX_TS_RECORD)pTs; struct tx_ts_record *pTxTS = (struct tx_ts_record *)pTs;
del_timer_sync(&pTxTS->TsAddBaTimer); del_timer_sync(&pTxTS->TsAddBaTimer);
} }
} }
...@@ -555,7 +555,7 @@ void RemoveAllTS(struct rtllib_device* ieee) ...@@ -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) if (pTxTS->bAddBaReqInProgress == false)
{ {
......
...@@ -2160,7 +2160,7 @@ struct rtllib_device { ...@@ -2160,7 +2160,7 @@ struct rtllib_device {
struct list_head Tx_TS_Admit_List; struct list_head Tx_TS_Admit_List;
struct list_head Tx_TS_Pending_List; struct list_head Tx_TS_Pending_List;
struct list_head Tx_TS_Unused_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_Admit_List;
struct list_head Rx_TS_Pending_List; struct list_head Rx_TS_Pending_List;
struct list_head Rx_TS_Unused_List; struct list_head Rx_TS_Unused_List;
...@@ -2913,7 +2913,7 @@ extern u16 TxCountToDataRate( struct rtllib_device* ieee, u8 nDataRate); ...@@ -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_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_ADDBARsp( struct rtllib_device* ieee, struct sk_buff *skb);
extern int rtllib_rx_DELBA(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 TsInitDelBA( struct rtllib_device* ieee, PTS_COMMON_INFO pTsCommonInfo, TR_SELECT TxRxSelect);
extern void BaSetupTimeOut(unsigned long data); extern void BaSetupTimeOut(unsigned long data);
extern void TxBaInactTimeout(unsigned long data); extern void TxBaInactTimeout(unsigned long data);
...@@ -2928,7 +2928,7 @@ extern bool GetTs( ...@@ -2928,7 +2928,7 @@ extern bool GetTs(
bool bAddNewTs bool bAddNewTs
); );
extern void TSInitialize(struct rtllib_device *ieee); 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 RemovePeerTS(struct rtllib_device* ieee, u8* Addr);
extern void RemoveAllTS(struct rtllib_device* ieee); extern void RemoveAllTS(struct rtllib_device* ieee);
void rtllib_softmac_scan_syncro(struct rtllib_device *ieee, u8 is_mesh); void rtllib_softmac_scan_syncro(struct rtllib_device *ieee, u8 is_mesh);
......
...@@ -290,7 +290,7 @@ rtllib_classify(struct sk_buff *skb, u8 bIsAmsdu) ...@@ -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) void rtllib_tx_query_agg_cap(struct rtllib_device* ieee, struct sk_buff* skb, cb_desc* tcb_desc)
{ {
PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; 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; struct rtllib_hdr_1addr* hdr = (struct rtllib_hdr_1addr*)skb->data;
if (rtllib_act_scanning(ieee,false)) if (rtllib_act_scanning(ieee,false))
...@@ -535,7 +535,7 @@ u16 rtllib_query_seqnum(struct rtllib_device*ieee, struct sk_buff* skb, u8* dst) ...@@ -535,7 +535,7 @@ u16 rtllib_query_seqnum(struct rtllib_device*ieee, struct sk_buff* skb, u8* dst)
return 0; return 0;
if (IsQoSDataFrame(skb->data)) 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)) if (!GetTs(ieee, (PTS_COMMON_INFO*)(&pTS), dst, skb->priority, TX_DIR, true))
{ {
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment