Commit 6ae62698 authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman

staging:rtl8192u: remove typedef of struct TS_COMMON_INFO - Style

To clear a checkpatch issue removed the typedef of the structure
TS_COMMON_INFO.

This change removes the previous declaration, which defined two types, both
TS_COMMON_INFO and a pointer type PTS_COMMON_INFO:

typedef struct _TS_COMMON_INFO {
	...
} TS_COMMON_INFO, *PTS_COMMON_INFO;

The pointer type has been completely removed from the code, as:
"(so-called Hungarian notation) is brain damaged" according to the coding
standard.
Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 336b2577
...@@ -2391,7 +2391,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb); ...@@ -2391,7 +2391,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb);
void TsInitAddBA(struct ieee80211_device *ieee, PTX_TS_RECORD pTS, void TsInitAddBA(struct ieee80211_device *ieee, PTX_TS_RECORD pTS,
u8 Policy, u8 bOverwritePending); u8 Policy, u8 bOverwritePending);
void TsInitDelBA(struct ieee80211_device *ieee, void TsInitDelBA(struct ieee80211_device *ieee,
PTS_COMMON_INFO pTsCommonInfo, enum tr_select TxRxSelect); struct ts_common_info *pTsCommonInfo, enum tr_select TxRxSelect);
void BaSetupTimeOut(struct timer_list *t); void BaSetupTimeOut(struct timer_list *t);
void TxBaInactTimeout(struct timer_list *t); void TxBaInactTimeout(struct timer_list *t);
void RxBaInactTimeout(struct timer_list *t); void RxBaInactTimeout(struct timer_list *t);
...@@ -2399,7 +2399,7 @@ void ResetBaEntry(PBA_RECORD pBA); ...@@ -2399,7 +2399,7 @@ void ResetBaEntry(PBA_RECORD pBA);
//function in TS.c //function in TS.c
bool GetTs( bool GetTs(
struct ieee80211_device *ieee, struct ieee80211_device *ieee,
PTS_COMMON_INFO *ppTS, struct ts_common_info **ppTS,
u8 *Addr, u8 *Addr,
u8 TID, u8 TID,
enum tr_select TxRxSelect, //Rx:1, Tx:0 enum tr_select TxRxSelect, //Rx:1, Tx:0
......
...@@ -1021,7 +1021,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, ...@@ -1021,7 +1021,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
//IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): QOS ENABLE AND RECEIVE QOS DATA , we will get Ts, tid:%d\n",__func__, tid); //IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): QOS ENABLE AND RECEIVE QOS DATA , we will get Ts, tid:%d\n",__func__, tid);
if(GetTs( if(GetTs(
ieee, ieee,
(PTS_COMMON_INFO *) &pRxTS, (struct ts_common_info **) &pRxTS,
hdr->addr2, hdr->addr2,
Frame_QoSTID((u8 *)(skb->data)), Frame_QoSTID((u8 *)(skb->data)),
RX_DIR, RX_DIR,
...@@ -1266,7 +1266,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, ...@@ -1266,7 +1266,7 @@ int ieee80211_rx(struct ieee80211_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;
......
...@@ -330,7 +330,7 @@ static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee, ...@@ -330,7 +330,7 @@ static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee,
} }
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("===>can't get TS\n"); printk("===>can't get TS\n");
return; return;
...@@ -585,7 +585,7 @@ static void ieee80211_query_seqnum(struct ieee80211_device *ieee, ...@@ -585,7 +585,7 @@ static void ieee80211_query_seqnum(struct ieee80211_device *ieee,
if (IsQoSDataFrame(skb->data)) //we deal qos data only if (IsQoSDataFrame(skb->data)) //we deal qos data only
{ {
PTX_TS_RECORD pTS = NULL; PTX_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; return;
} }
......
...@@ -360,7 +360,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb) ...@@ -360,7 +360,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)
// If there is no matched TS, reject the ADDBA request. // If there is no matched TS, reject the ADDBA request.
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,
...@@ -459,7 +459,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb) ...@@ -459,7 +459,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_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),
TX_DIR, TX_DIR,
...@@ -570,7 +570,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb) ...@@ -570,7 +570,7 @@ int ieee80211_rx_DELBA(struct ieee80211_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,
...@@ -585,7 +585,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb) ...@@ -585,7 +585,7 @@ int ieee80211_rx_DELBA(struct ieee80211_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,
...@@ -638,7 +638,7 @@ TsInitAddBA( ...@@ -638,7 +638,7 @@ TsInitAddBA(
} }
void void
TsInitDelBA(struct ieee80211_device *ieee, PTS_COMMON_INFO pTsCommonInfo, enum tr_select TxRxSelect) TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo, enum tr_select TxRxSelect)
{ {
if (TxRxSelect == TX_DIR) { if (TxRxSelect == TX_DIR) {
PTX_TS_RECORD pTxTs = (PTX_TS_RECORD)pTsCommonInfo; PTX_TS_RECORD pTxTs = (PTX_TS_RECORD)pTsCommonInfo;
......
...@@ -15,7 +15,7 @@ enum tr_select { ...@@ -15,7 +15,7 @@ enum tr_select {
RX_DIR = 1, RX_DIR = 1,
}; };
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;
...@@ -24,10 +24,10 @@ typedef struct _TS_COMMON_INFO { ...@@ -24,10 +24,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; };
typedef struct _TX_TS_RECORD { typedef struct _TX_TS_RECORD {
TS_COMMON_INFO TsCommonInfo; struct ts_common_info TsCommonInfo;
u16 TxCurSeq; u16 TxCurSeq;
BA_RECORD TxPendingBARecord; /* For BA Originator */ BA_RECORD TxPendingBARecord; /* For BA Originator */
BA_RECORD TxAdmittedBARecord; /* For BA Originator */ BA_RECORD TxAdmittedBARecord; /* For BA Originator */
...@@ -40,7 +40,7 @@ typedef struct _TX_TS_RECORD { ...@@ -40,7 +40,7 @@ typedef struct _TX_TS_RECORD {
} TX_TS_RECORD, *PTX_TS_RECORD; } TX_TS_RECORD, *PTX_TS_RECORD;
typedef struct _RX_TS_RECORD { typedef 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;
......
...@@ -101,7 +101,7 @@ static void TsAddBaProcess(struct timer_list *t) ...@@ -101,7 +101,7 @@ static void TsAddBaProcess(struct timer_list *t)
} }
static void ResetTsCommonInfo(PTS_COMMON_INFO pTsCommonInfo) static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo)
{ {
eth_zero_addr(pTsCommonInfo->Addr); eth_zero_addr(pTsCommonInfo->Addr);
memset(&pTsCommonInfo->TSpec, 0, sizeof(TSPEC_BODY)); memset(&pTsCommonInfo->TSpec, 0, sizeof(TSPEC_BODY));
...@@ -191,7 +191,7 @@ void TSInitialize(struct ieee80211_device *ieee) ...@@ -191,7 +191,7 @@ void TSInitialize(struct ieee80211_device *ieee)
} }
static void AdmitTS(struct ieee80211_device *ieee, static void AdmitTS(struct ieee80211_device *ieee,
PTS_COMMON_INFO pTsCommonInfo, u32 InactTime) 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);
...@@ -202,7 +202,7 @@ static void AdmitTS(struct ieee80211_device *ieee, ...@@ -202,7 +202,7 @@ static void AdmitTS(struct ieee80211_device *ieee,
} }
static PTS_COMMON_INFO SearchAdmitTRStream(struct ieee80211_device *ieee, static struct ts_common_info *SearchAdmitTRStream(struct ieee80211_device *ieee,
u8 *Addr, u8 TID, u8 *Addr, u8 TID,
enum tr_select TxRxSelect) enum tr_select TxRxSelect)
{ {
...@@ -210,7 +210,7 @@ static PTS_COMMON_INFO SearchAdmitTRStream(struct ieee80211_device *ieee, ...@@ -210,7 +210,7 @@ static PTS_COMMON_INFO SearchAdmitTRStream(struct ieee80211_device *ieee,
u8 dir; u8 dir;
bool search_dir[4] = {0}; bool search_dir[4] = {0};
struct list_head *psearch_list; //FIXME struct list_head *psearch_list; //FIXME
PTS_COMMON_INFO pRet = NULL; struct ts_common_info *pRet = NULL;
if(ieee->iw_mode == IW_MODE_MASTER) { //ap mode if(ieee->iw_mode == IW_MODE_MASTER) { //ap mode
if(TxRxSelect == TX_DIR) { if(TxRxSelect == TX_DIR) {
search_dir[DIR_DOWN] = true; search_dir[DIR_DOWN] = true;
...@@ -264,7 +264,7 @@ static PTS_COMMON_INFO SearchAdmitTRStream(struct ieee80211_device *ieee, ...@@ -264,7 +264,7 @@ static PTS_COMMON_INFO SearchAdmitTRStream(struct ieee80211_device *ieee,
return NULL; return NULL;
} }
static void MakeTSEntry(PTS_COMMON_INFO pTsCommonInfo, u8 *Addr, static void MakeTSEntry(struct ts_common_info *pTsCommonInfo, u8 *Addr,
PTSPEC_BODY pTSPEC, PQOS_TCLAS pTCLAS, u8 TCLAS_Num, PTSPEC_BODY pTSPEC, PQOS_TCLAS pTCLAS, u8 TCLAS_Num,
u8 TCLAS_Proc) u8 TCLAS_Proc)
{ {
...@@ -288,7 +288,7 @@ static void MakeTSEntry(PTS_COMMON_INFO pTsCommonInfo, u8 *Addr, ...@@ -288,7 +288,7 @@ static void MakeTSEntry(PTS_COMMON_INFO pTsCommonInfo, u8 *Addr,
bool GetTs( bool GetTs(
struct ieee80211_device *ieee, struct ieee80211_device *ieee,
PTS_COMMON_INFO *ppTS, struct ts_common_info **ppTS,
u8 *Addr, u8 *Addr,
u8 TID, u8 TID,
enum tr_select TxRxSelect, //Rx:1, Tx:0 enum tr_select TxRxSelect, //Rx:1, Tx:0
...@@ -371,7 +371,7 @@ bool GetTs( ...@@ -371,7 +371,7 @@ bool GetTs(
((TxRxSelect==TX_DIR)?DIR_UP:DIR_DOWN); ((TxRxSelect==TX_DIR)?DIR_UP:DIR_DOWN);
IEEE80211_DEBUG(IEEE80211_DL_TS, "to add Ts\n"); IEEE80211_DEBUG(IEEE80211_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) {
PTX_TS_RECORD tmp = container_of(*ppTS, TX_TS_RECORD, TsCommonInfo); PTX_TS_RECORD tmp = container_of(*ppTS, TX_TS_RECORD, TsCommonInfo);
...@@ -407,7 +407,7 @@ bool GetTs( ...@@ -407,7 +407,7 @@ bool GetTs(
} }
} }
static void RemoveTsEntry(struct ieee80211_device *ieee, PTS_COMMON_INFO pTs, static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info *pTs,
enum tr_select TxRxSelect) enum tr_select TxRxSelect)
{ {
//u32 flags = 0; //u32 flags = 0;
...@@ -454,7 +454,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, PTS_COMMON_INFO pTs, ...@@ -454,7 +454,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, PTS_COMMON_INFO pTs,
void RemovePeerTS(struct ieee80211_device *ieee, u8 *Addr) void RemovePeerTS(struct ieee80211_device *ieee, u8 *Addr)
{ {
PTS_COMMON_INFO pTS, pTmpTS; struct ts_common_info *pTS, *pTmpTS;
printk("===========>RemovePeerTS,%pM\n", Addr); printk("===========>RemovePeerTS,%pM\n", 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) {
...@@ -493,7 +493,7 @@ void RemovePeerTS(struct ieee80211_device *ieee, u8 *Addr) ...@@ -493,7 +493,7 @@ void RemovePeerTS(struct ieee80211_device *ieee, u8 *Addr)
void RemoveAllTS(struct ieee80211_device *ieee) void RemoveAllTS(struct ieee80211_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) {
RemoveTsEntry(ieee, pTS, TX_DIR); RemoveTsEntry(ieee, pTS, TX_DIR);
......
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