evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: rtl8192e: Convert typedef TS_COMMON_INFO to struct ts_common_info

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:19:19 -05:00
parent 2c47ae282a
commit 74724de1c4
6 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -273,7 +273,7 @@ int rtllib_rx_ADDBAReq( struct rtllib_device* ieee, struct sk_buff *skb)
} }
if (!GetTs( if (!GetTs(
ieee, ieee,
(PTS_COMMON_INFO*)(&pTS), (struct ts_common_info **)(&pTS),
dst, dst,
(u8)(pBaParamSet->field.TID), (u8)(pBaParamSet->field.TID),
RX_DIR, 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)) { (u8)(pBaParamSet->field.TID), TX_DIR, false)) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "can't get TS in %s()\n", __func__); RTLLIB_DEBUG(RTLLIB_DL_ERR, "can't get TS in %s()\n", __func__);
ReasonCode = DELBA_REASON_UNKNOWN_BA; ReasonCode = DELBA_REASON_UNKNOWN_BA;
@ -461,7 +461,7 @@ int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb)
if ( !GetTs( if ( !GetTs(
ieee, ieee,
(PTS_COMMON_INFO*)&pRxTs, (struct ts_common_info **)&pRxTs,
dst, dst,
(u8)pDelBaParamSet->field.TID, (u8)pDelBaParamSet->field.TID,
RX_DIR, RX_DIR,
@ -479,7 +479,7 @@ int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb)
if (!GetTs( if (!GetTs(
ieee, ieee,
(PTS_COMMON_INFO*)&pTxTs, (struct ts_common_info **)&pTxTs,
dst, dst,
(u8)pDelBaParamSet->field.TID, (u8)pDelBaParamSet->field.TID,
TX_DIR, TX_DIR,
@ -527,7 +527,7 @@ TsInitAddBA(
} }
void 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) if (TxRxSelect == TX_DIR)

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

@ -31,7 +31,7 @@ typedef enum _TR_SELECT {
RX_DIR = 1, RX_DIR = 1,
} TR_SELECT, *PTR_SELECT; } TR_SELECT, *PTR_SELECT;
typedef struct _TS_COMMON_INFO{ struct ts_common_info {
struct list_head List; struct list_head List;
struct timer_list SetupTimer; struct timer_list SetupTimer;
struct timer_list InactTimer; struct timer_list InactTimer;
@ -40,10 +40,10 @@ typedef struct _TS_COMMON_INFO{
QOS_TCLAS TClass[TCLAS_NUM]; QOS_TCLAS TClass[TCLAS_NUM];
u8 TClasProc; u8 TClasProc;
u8 TClasNum; u8 TClasNum;
} TS_COMMON_INFO, *PTS_COMMON_INFO; };
struct tx_ts_record { struct tx_ts_record {
TS_COMMON_INFO TsCommonInfo; struct ts_common_info TsCommonInfo;
u16 TxCurSeq; u16 TxCurSeq;
BA_RECORD TxPendingBARecord; BA_RECORD TxPendingBARecord;
BA_RECORD TxAdmittedBARecord; BA_RECORD TxAdmittedBARecord;
@ -56,7 +56,7 @@ struct tx_ts_record {
}; };
struct rx_ts_record { struct rx_ts_record {
TS_COMMON_INFO TsCommonInfo; struct ts_common_info TsCommonInfo;
u16 RxIndicateSeq; u16 RxIndicateSeq;
u16 RxTimeoutIndicateSeq; u16 RxTimeoutIndicateSeq;
struct list_head RxPendingPktList; struct list_head RxPendingPktList;

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

@ -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->Addr, 0, 6);
memset(&pTsCommonInfo->TSpec, 0, sizeof(TSPEC_BODY)); 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->SetupTimer);
del_timer_sync(&pTsCommonInfo->InactTimer); 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; u8 dir;
bool search_dir[4] = {0, 0, 0, 0}; bool search_dir[4] = {0, 0, 0, 0};
struct list_head* psearch_list; struct list_head* psearch_list;
PTS_COMMON_INFO pRet = NULL; struct ts_common_info *pRet = NULL;
if (ieee->iw_mode == IW_MODE_MASTER) if (ieee->iw_mode == IW_MODE_MASTER)
{ {
if (TxRxSelect == TX_DIR) if (TxRxSelect == TX_DIR)
@ -291,7 +291,7 @@ PTS_COMMON_INFO SearchAdmitTRStream(struct rtllib_device *ieee, u8* Addr, u8 TID
} }
void MakeTSEntry( void MakeTSEntry(
PTS_COMMON_INFO pTsCommonInfo, struct ts_common_info *pTsCommonInfo,
u8* Addr, u8* Addr,
PTSPEC_BODY pTSPEC, PTSPEC_BODY pTSPEC,
PQOS_TCLAS pTCLAS, PQOS_TCLAS pTCLAS,
@ -318,7 +318,7 @@ void MakeTSEntry(
bool GetTs( bool GetTs(
struct rtllib_device* ieee, struct rtllib_device* ieee,
PTS_COMMON_INFO *ppTS, struct ts_common_info **ppTS,
u8* Addr, u8* Addr,
u8 TID, u8 TID,
TR_SELECT TxRxSelect, TR_SELECT TxRxSelect,
@ -394,7 +394,7 @@ bool GetTs(
RTLLIB_DEBUG(RTLLIB_DL_TS, "to add Ts\n"); RTLLIB_DEBUG(RTLLIB_DL_TS, "to add Ts\n");
if (!list_empty(pUnusedList)) 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); list_del_init(&(*ppTS)->List);
if (TxRxSelect==TX_DIR) if (TxRxSelect==TX_DIR)
{ {
@ -434,7 +434,7 @@ bool GetTs(
void RemoveTsEntry( void RemoveTsEntry(
struct rtllib_device* ieee, struct rtllib_device* ieee,
PTS_COMMON_INFO pTs, struct ts_common_info *pTs,
TR_SELECT TxRxSelect TR_SELECT TxRxSelect
) )
{ {
@ -477,7 +477,7 @@ void RemoveTsEntry(
void RemovePeerTS(struct rtllib_device* ieee, u8* Addr) 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)); printk("===========>RemovePeerTS,"MAC_FMT"\n", MAC_ARG(Addr));
list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List) 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) 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) list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List)
{ {

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

@ -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_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, struct tx_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, struct ts_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);
extern void RxBaInactTimeout(unsigned long data); extern void RxBaInactTimeout(unsigned long data);
extern void ResetBaEntry( PBA_RECORD pBA); extern void ResetBaEntry( PBA_RECORD pBA);
extern bool GetTs( extern bool GetTs(
struct rtllib_device* ieee, struct rtllib_device* ieee,
PTS_COMMON_INFO *ppTS, struct ts_common_info **ppTS,
u8* Addr, u8* Addr,
u8 TID, u8 TID,
TR_SELECT TxRxSelect, TR_SELECT TxRxSelect,

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

@ -897,7 +897,7 @@ int rtllib_rx_check_duplicate(struct rtllib_device *ieee, struct sk_buff *skb, u
} }
} else { } else {
struct rx_ts_record *pRxTS = NULL; 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)) { (u8)Frame_QoSTID((u8*)(skb->data)), RX_DIR, true)) {
if ((fc & (1<<11)) && (frag == pRxTS->RxLastFragNum) && if ((fc & (1<<11)) && (frag == pRxTS->RxLastFragNum) &&
(WLAN_GET_SEQ_SEQ(sc) == pRxTS->RxLastSeqNum)) { (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); TID = Frame_QoSTID(skb->data);
SeqNum = WLAN_GET_SEQ_SEQ(sc); 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){ if (TID !=0 && TID !=3){
ieee->bis_any_nonbepkts = true; ieee->bis_any_nonbepkts = true;
} }

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

@ -312,7 +312,7 @@ void rtllib_tx_query_agg_cap(struct rtllib_device* ieee, struct sk_buff* skb, cb
if (!ieee->GetNmodeSupportBySecCfg(ieee->dev)) if (!ieee->GetNmodeSupportBySecCfg(ieee->dev))
return; return;
if (pHTInfo->bCurrentAMPDUEnable){ 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__); printk("%s: can't get TS\n", __func__);
return; return;
} }
@ -536,7 +536,7 @@ u16 rtllib_query_seqnum(struct rtllib_device*ieee, struct sk_buff* skb, u8* dst)
if (IsQoSDataFrame(skb->data)) if (IsQoSDataFrame(skb->data))
{ {
struct tx_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, (struct ts_common_info **)(&pTS), dst, skb->priority, TX_DIR, true))
{ {
return 0; return 0;
} }