[PATCH 004/166] staging: rtl8192e: Convert typedef TS_COMMON_INFO to struct ts_common_info
Larry Finger
Larry.Finger at lwfinger.net
Thu Aug 25 04:47:11 UTC 2011
Remove typedef from struct.
Rename struct.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
---
drivers/staging/rtl8192e/rtl819x_BAProc.c | 10 +++++-----
drivers/staging/rtl8192e/rtl819x_TS.h | 8 ++++----
drivers/staging/rtl8192e/rtl819x_TSProc.c | 20 ++++++++++----------
drivers/staging/rtl8192e/rtllib.h | 4 ++--
drivers/staging/rtl8192e/rtllib_rx.c | 4 ++--
drivers/staging/rtl8192e/rtllib_tx.c | 4 ++--
6 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c
index 42e66a5..165bfae 100644
--- a/drivers/staging/rtl8192e/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c
@@ -273,7 +273,7 @@ int rtllib_rx_ADDBAReq( struct rtllib_device* ieee, struct sk_buff *skb)
}
if (!GetTs(
ieee,
- (PTS_COMMON_INFO*)(&pTS),
+ (struct ts_common_info **)(&pTS),
dst,
(u8)(pBaParamSet->field.TID),
RX_DIR,
@@ -361,7 +361,7 @@ int rtllib_rx_ADDBARsp( struct rtllib_device* ieee, struct sk_buff *skb)
}
- 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,7 +461,7 @@ int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb)
if ( !GetTs(
ieee,
- (PTS_COMMON_INFO*)&pRxTs,
+ (struct ts_common_info **)&pRxTs,
dst,
(u8)pDelBaParamSet->field.TID,
RX_DIR,
@@ -479,7 +479,7 @@ int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb)
if (!GetTs(
ieee,
- (PTS_COMMON_INFO*)&pTxTs,
+ (struct ts_common_info **)&pTxTs,
dst,
(u8)pDelBaParamSet->field.TID,
TX_DIR,
@@ -527,7 +527,7 @@ TsInitAddBA(
}
void
-TsInitDelBA( struct rtllib_device* ieee, PTS_COMMON_INFO pTsCommonInfo, TR_SELECT TxRxSelect)
+TsInitDelBA( struct rtllib_device* ieee, struct ts_common_info *pTsCommonInfo, TR_SELECT TxRxSelect)
{
if (TxRxSelect == TX_DIR)
diff --git a/drivers/staging/rtl8192e/rtl819x_TS.h b/drivers/staging/rtl8192e/rtl819x_TS.h
index aa758a6..20f8486 100644
--- a/drivers/staging/rtl8192e/rtl819x_TS.h
+++ b/drivers/staging/rtl8192e/rtl819x_TS.h
@@ -31,7 +31,7 @@ typedef enum _TR_SELECT {
RX_DIR = 1,
} TR_SELECT, *PTR_SELECT;
-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{
QOS_TCLAS TClass[TCLAS_NUM];
u8 TClasProc;
u8 TClasNum;
-} TS_COMMON_INFO, *PTS_COMMON_INFO;
+};
struct tx_ts_record {
- TS_COMMON_INFO TsCommonInfo;
+ struct ts_common_info TsCommonInfo;
u16 TxCurSeq;
BA_RECORD TxPendingBARecord;
BA_RECORD TxAdmittedBARecord;
@@ -56,7 +56,7 @@ struct tx_ts_record {
};
struct rx_ts_record {
- TS_COMMON_INFO TsCommonInfo;
+ struct ts_common_info TsCommonInfo;
u16 RxIndicateSeq;
u16 RxTimeoutIndicateSeq;
struct list_head RxPendingPktList;
diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c
index 2ddb652..6c60df0 100644
--- a/drivers/staging/rtl8192e/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c
@@ -102,7 +102,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(TSPEC_BODY));
@@ -209,7 +209,7 @@ void TSInitialize(struct rtllib_device *ieee)
}
-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);
@@ -219,12 +219,12 @@ void AdmitTS(struct rtllib_device *ieee, PTS_COMMON_INFO pTsCommonInfo, u32 Inac
}
-PTS_COMMON_INFO SearchAdmitTRStream(struct rtllib_device *ieee, u8* Addr, u8 TID, TR_SELECT TxRxSelect)
+struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ieee, u8* Addr, u8 TID, 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)
@@ -291,7 +291,7 @@ PTS_COMMON_INFO SearchAdmitTRStream(struct rtllib_device *ieee, u8* Addr, u8 TID
}
void MakeTSEntry(
- PTS_COMMON_INFO pTsCommonInfo,
+ struct ts_common_info *pTsCommonInfo,
u8* Addr,
PTSPEC_BODY pTSPEC,
PQOS_TCLAS pTCLAS,
@@ -318,7 +318,7 @@ void MakeTSEntry(
bool GetTs(
struct rtllib_device* ieee,
- PTS_COMMON_INFO *ppTS,
+ struct ts_common_info **ppTS,
u8* Addr,
u8 TID,
TR_SELECT TxRxSelect,
@@ -394,7 +394,7 @@ bool GetTs(
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)
{
@@ -434,7 +434,7 @@ bool GetTs(
void RemoveTsEntry(
struct rtllib_device* ieee,
- PTS_COMMON_INFO pTs,
+ struct ts_common_info *pTs,
TR_SELECT TxRxSelect
)
{
@@ -477,7 +477,7 @@ void RemoveTsEntry(
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 +524,7 @@ void RemovePeerTS(struct rtllib_device* ieee, u8* Addr)
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)
{
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 4fd0e0c..e9317d2 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -2914,14 +2914,14 @@ 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, 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, struct ts_common_info *pTsCommonInfo, TR_SELECT TxRxSelect);
extern void BaSetupTimeOut(unsigned long data);
extern void TxBaInactTimeout(unsigned long data);
extern void RxBaInactTimeout(unsigned long data);
extern void ResetBaEntry( PBA_RECORD pBA);
extern bool GetTs(
struct rtllib_device* ieee,
- PTS_COMMON_INFO *ppTS,
+ struct ts_common_info **ppTS,
u8* Addr,
u8 TID,
TR_SELECT TxRxSelect,
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index 3571531..3c8c11c 100644
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -897,7 +897,7 @@ int rtllib_rx_check_duplicate(struct rtllib_device *ieee, struct sk_buff *skb, u
}
} else {
struct rx_ts_record *pRxTS = NULL;
- if (GetTs(ieee, (PTS_COMMON_INFO*) &pRxTS, hdr->addr2,
+ 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)) {
@@ -1356,7 +1356,7 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
{
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;
}
diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index 0903259..dae5df4 100644
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -312,7 +312,7 @@ void rtllib_tx_query_agg_cap(struct rtllib_device* ieee, struct sk_buff* skb, cb
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;
}
@@ -536,7 +536,7 @@ u16 rtllib_query_seqnum(struct rtllib_device*ieee, struct sk_buff* skb, u8* dst)
if (IsQoSDataFrame(skb->data))
{
struct tx_ts_record *pTS = NULL;
- if (!GetTs(ieee, (PTS_COMMON_INFO*)(&pTS), dst, skb->priority, TX_DIR, true))
+ if (!GetTs(ieee, (struct ts_common_info **)(&pTS), dst, skb->priority, TX_DIR, true))
{
return 0;
}
--
1.7.3.4
More information about the devel
mailing list