staging:rtl8192u Header file cleanup - Style
cover staging:rtl8192u Header file cleanup - Style
Coding style cleanup of drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
The only checkpatch issues which remain are three 'questionable' comments which extend over the 80 character line limit.
The changes are generally either removal of typedef directives, removal of unused constants or renaming of CamelCase variable names.
John Whitmore (20):
staging:rtl8192u: Remove typedef and rename TX_TS_RECORD - Style staging:rtl8192u: Rename TsCommonInfo - Style staging:rtl8192u: Rename TxCurSeq - Style staging:rtl8192u: Rename TxPendingBARecord - Style staging:rtl8192u: Rename TxAdmittedBARecord - Style staging:rtl8192u: Rename bAddBaReqInProgress - Style staging:rtl8192u: Rename bAddBaReqDelayed - Style staging:rtl8192u: Rename bUsingBa - Style staging:rtl8192u: Rename TsAddBaTimer - Style staging:rtl8192u: Remove typedef and rename RX_TS_RECORD - Style staging:rtl8192u: Remove commented out code - Style staging:rtl8192u: Remove unused timer values - Style staging:rtl8192u: Rename RxIndicateSeq - Style staging:rtl8192u: Rename RxTimeoutIndicateSeq _Style staging:rtl8192u: Rename RxPendingPktList - Style staging:rtl8192u: Rename RxPktPendingTimer - Style staging:rtl8192u: Rename RxAdmittedBARecord - Style staging:rtl8192u: Rename RxLastSeqNum - Style staging:rtl8192u: Rename RxLastFragNum - Style staging:rtl8192u: Remove blank line - Style
.../staging/rtl8192u/ieee80211/ieee80211.h | 8 +- .../staging/rtl8192u/ieee80211/ieee80211_rx.c | 80 ++++++------ .../staging/rtl8192u/ieee80211/ieee80211_tx.c | 14 +- .../rtl8192u/ieee80211/rtl819x_BAProc.c | 88 ++++++------- .../staging/rtl8192u/ieee80211/rtl819x_TS.h | 46 +++---- .../rtl8192u/ieee80211/rtl819x_TSProc.c | 120 +++++++++--------- 6 files changed, 176 insertions(+), 180 deletions(-)
Signature · 1 line
2.18.0
PATCH 1/20 staging:rtl8192u: Remove typedef and rename TX_TS_RECORD - Style
Remove the typdef from structure TX_TS_RECORD and rename to tx_ts_record. The removal of the typedef clears the checkpatch issue with creating new types in code. The name change, whilst not specifically flagged by checkpatch, is an issue since types are meant to be named in lowercase.
These changes are purely coding style changes and should have no impact on runtime execution.
--- .../staging/rtl8192u/ieee80211/ieee80211.h | 6 +++--- .../staging/rtl8192u/ieee80211/ieee80211_tx.c | 4 ++-- .../rtl8192u/ieee80211/rtl819x_BAProc.c | 20 +++++++++---------- .../staging/rtl8192u/ieee80211/rtl819x_TS.h | 4 ++-- .../rtl8192u/ieee80211/rtl819x_TSProc.c | 16 +++++++-------- 5 files changed, 25 insertions(+), 25 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211.h +3 -3
@@ -1646,7 +1646,7 @@ struct ieee80211_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 ];// 802.11e and WMM Traffic Stream Info (RX) struct list_head Rx_TS_Admit_List;struct list_head Rx_TS_Pending_List;
@@ -2388,7 +2388,7 @@ u16 TxCountToDataRate(struct ieee80211_device *ieee, u8 nDataRate);int ieee80211_rx_ADDBAReq (struct ieee80211_device *ieee,struct sk_buff *skb);int ieee80211_rx_ADDBARsp (struct ieee80211_device *ieee,struct sk_buff *skb);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,struct tx_ts_record *pTS,u8 Policy,u8 bOverwritePending);void TsInitDelBA (struct ieee80211_device *ieee,struct ts_common_info *pTsCommonInfo,enum tr_select TxRxSelect);
@@ -2406,7 +2406,7 @@ bool GetTs(bool bAddNewTs );void TSInitialize (struct ieee80211_device *ieee); -void TsStartAddBaProcess (struct ieee80211_device *ieee,PTX_TS_RECORD pTxTS); +void TsStartAddBaProcess (struct ieee80211_device *ieee,struct tx_ts_record *pTxTS);void RemovePeerTS (struct ieee80211_device *ieee,u8 *Addr);void RemoveAllTS (struct ieee80211_device *ieee);void ieee80211_softmac_scan_syncro (struct ieee80211_device *ieee);
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +2 -2
@@ -306,7 +306,7 @@ static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee, struct sk_buff *skb, struct cb_desc *tcb_desc) { PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; -PTX_TS_RECORD pTxTs =NULL ; +struct tx_ts_record *pTxTs =NULL ;struct rtl_80211_hdr_1addr *hdr = (struct rtl_80211_hdr_1addr *)skb->data;if (!pHTInfo->bCurrentHTSupport||!pHTInfo->bEnableHT)
@@ -584,7 +584,7 @@ static void ieee80211_query_seqnum(struct ieee80211_device *ieee,return ;if (IsQoSDataFrame (skb->data))//we deal qos data only { -PTX_TS_RECORD pTS =NULL ; +struct tx_ts_record *pTS =NULL ;if (!GetTs (ieee, (struct ts_common_info **)(&pTS), dst, skb->priority,TX_DIR , true)) {return ;
drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c +10 -10
@@ -36,11 +36,11 @@ static void DeActivateBAEntry(struct ieee80211_device *ieee, PBA_RECORD pBA)/******************************************************************************************************************** *function: deactivete BA entry in Tx Ts, and send DELBA. * input: -* PTX_TS_RECORD pTxTs //Tx Ts which is to deactivate BA entry. +* struct tx_ts_record *pTxTs //Tx Ts which is to deactivate BA entry. * output: none -* notice: As PTX_TS_RECORD structure will be defined in QOS, so wait to be merged. //FIXME +* notice: As struct tx_ts_record * structure will be defined in QOS, so wait to be merged. //FIXME ********************************************************************************************************************/ -static u8 TxTsDeleteBA (struct ieee80211_device *ieee,PTX_TS_RECORD pTxTs) +static u8 TxTsDeleteBA (struct ieee80211_device *ieee,struct tx_ts_record *pTxTs) {PBA_RECORD pAdmittedBa = &pTxTs->TxAdmittedBARecord;//These two BA entries must exist in TS structure PBA_RECORD pPendingBa = &pTxTs->TxPendingBARecord;
@@ -420,7 +420,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb) {struct rtl_80211_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 ;
@@ -581,7 +581,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb)RxTsDeleteBA (ieee, pRxTs); } else { - PTX_TS_RECORD pTxTs; + struct tx_ts_record *pTxTs; if (!GetTs( ieee,
@@ -610,7 +610,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb)void TsInitAddBA (struct ieee80211_device *ieee, -PTX_TS_RECORD pTS, +struct tx_ts_record *pTS,u8 Policy,u8 bOverwritePending )
@@ -641,7 +641,7 @@ void TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo, enum tr_select TxRxSelect) { 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)) ieee80211_send_DELBA(
@@ -663,13 +663,13 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo, }/******************************************************************************************************************** *function: BA setup timer -* input: unsigned long data //acturally we send TX_TS_RECORD or RX_TS_RECORD to these timer +* input: unsigned long data //acturally we send struct tx_ts_record or RX_TS_RECORD to these timer * return: NULL * notice: ********************************************************************************************************************/ void BaSetupTimeOut (struct timer_list *t) { -PTX_TS_RECORD pTxTs =from_timer (pTxTs, t, TxPendingBARecord.Timer); +struct tx_ts_record *pTxTs =from_timer (pTxTs, t, TxPendingBARecord.Timer); pTxTs->bAddBaReqInProgress = false; pTxTs->bAddBaReqDelayed = true;
@@ -678,7 +678,7 @@ void BaSetupTimeOut(struct timer_list *t)void TxBaInactTimeout (struct timer_list *t) { -PTX_TS_RECORD pTxTs =from_timer (pTxTs, t, TxAdmittedBARecord.Timer); +struct tx_ts_record *pTxTs =from_timer (pTxTs, t, TxAdmittedBARecord.Timer); struct ieee80211_device *ieee = container_of(pTxTs, struct ieee80211_device, TxTsRecord[pTxTs->num]);TxTsDeleteBA (ieee, pTxTs); ieee80211_send_DELBA(
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +2 -2
@@ -26,7 +26,7 @@ struct ts_common_info {u8 t_clas_num; }; -typedef struct _TX_TS_RECORD { +struct tx_ts_record {struct ts_common_info TsCommonInfo;u16 TxCurSeq;BA_RECORD TxPendingBARecord;/* For BA Originator */
@@ -37,7 +37,7 @@ typedef struct _TX_TS_RECORD {u8 bUsingBa;struct timer_list TsAddBaTimer;u8 num; -}TX_TS_RECORD , *PTX_TS_RECORD ; +}; typedef struct _RX_TS_RECORD { struct ts_common_info TsCommonInfo;
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +8 -8
@@ -19,7 +19,7 @@ static void TsInactTimeout(struct timer_list *unused)/******************************************************************************************************************** *function: I still not understand this function, so wait for further implementation -* input: unsigned long data //acturally we send TX_TS_RECORD or RX_TS_RECORD to these timer +* input: unsigned long data //acturally we send struct tx_ts_record or RX_TS_RECORD to these timer * return: NULL * notice: ********************************************************************************************************************/
@@ -86,13 +86,13 @@ static void RxPktPendingTimeout(struct timer_list *t)/******************************************************************************************************************** *function: Add BA timer function -* input: unsigned long data //acturally we send TX_TS_RECORD or RX_TS_RECORD to these timer +* input: unsigned long data //acturally we send struct tx_ts_record or RX_TS_RECORD to these timer * return: NULL * notice: ********************************************************************************************************************/ static void TsAddBaProcess (struct timer_list *t) { -PTX_TS_RECORD pTxTs =from_timer (pTxTs, t, TsAddBaTimer); +struct tx_ts_record *pTxTs =from_timer (pTxTs, t, TsAddBaTimer);u8 num = pTxTs->num; struct ieee80211_device *ieee = container_of(pTxTs, struct ieee80211_device, TxTsRecord[num]);
@@ -110,7 +110,7 @@ static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo) pTsCommonInfo->t_clas_num =0 ; } -static void ResetTxTsEntry (PTX_TS_RECORD pTS) +static void ResetTxTsEntry (struct tx_ts_record *pTS) {ResetTsCommonInfo (&pTS->TsCommonInfo); pTS->TxCurSeq =0 ;
@@ -131,7 +131,7 @@ static void ResetRxTsEntry(PRX_TS_RECORD pTS)void TSInitialize (struct ieee80211_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 ;
@@ -374,7 +374,7 @@ bool GetTs( (*ppTS) = list_entry(pUnusedList->next, struct ts_common_info, list);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 {PRX_TS_RECORD tmp =container_of (*ppTS,RX_TS_RECORD , TsCommonInfo);
@@ -447,7 +447,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info *//#endif }else { -PTX_TS_RECORD pTxTS = (PTX_TS_RECORD )pTs; +struct tx_ts_record *pTxTS = (struct tx_ts_record *)pTs;del_timer_sync (&pTxTS->TsAddBaTimer); } }
@@ -520,7 +520,7 @@ void RemoveAllTS(struct ieee80211_device *ieee) } } -void TsStartAddBaProcess (struct ieee80211_device *ieee,PTX_TS_RECORD pTxTS) +void TsStartAddBaProcess (struct ieee80211_device *ieee,struct tx_ts_record *pTxTS) {if (!pTxTS->bAddBaReqInProgress) { pTxTS->bAddBaReqInProgress = true;
Signature · 1 line
2.18.0
PATCH 2/20 staging:rtl8192u: Rename TsCommonInfo - Style
In reply to John WhitmoreRename the member variable TsCommonInfo in two structures, both tx_ts_record and RX_TS_RECORD. This member variable is used in both structures and in both cases causes a checkpatch issue with CamelCase naming.
The changes are purely coding style and should not impact runtime code execution.
--- .../rtl8192u/ieee80211/rtl819x_BAProc.c | 8 ++++---- .../staging/rtl8192u/ieee80211/rtl819x_TS.h | 4 ++-- .../rtl8192u/ieee80211/rtl819x_TSProc.c | 20 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c +4 -4
@@ -626,7 +626,7 @@ TsInitAddBA( pBA->DialogToken++;// DialogToken: Only keep the latest dialog token pBA->BaParamSet.field.AMSDU_Support =0 ;// Do not support A-MSDU with A-MPDU now!! pBA->BaParamSet.field.BAPolicy = Policy;// Policy: Delayed or Immediate - pBA->BaParamSet.field.TID = pTS->TsCommonInfo.t_spec.f.TSInfo.field.ucTSID;// TID + pBA->BaParamSet.field.TID = pTS->ts_common_info.t_spec.f.TSInfo.field.ucTSID;// TID // BufferSize: This need to be set according to A-MPDU vector pBA->BaParamSet.field.BufferSize =32 ;// BufferSize: This need to be set according to A-MPDU vector pBA->BaTimeoutValue =0 ;// Timeout value: Set 0 to disable Timer
@@ -634,7 +634,7 @@ TsInitAddBA(ActivateBAEntry (ieee, pBA,BA_SETUP_TIMEOUT ); -ieee80211_send_ADDBAReq (ieee, pTS->TsCommonInfo.addr, pBA); +ieee80211_send_ADDBAReq (ieee, pTS->ts_common_info.addr, pBA); }void
@@ -683,7 +683,7 @@ void TxBaInactTimeout(struct timer_list *t)TxTsDeleteBA (ieee, pTxTs);ieee80211_send_DELBA ( ieee, - pTxTs->TsCommonInfo.addr, + pTxTs->ts_common_info.addr, &pTxTs->TxAdmittedBARecord,TX_DIR ,DELBA_REASON_TIMEOUT );
@@ -697,7 +697,7 @@ void RxBaInactTimeout(struct timer_list *t)RxTsDeleteBA (ieee, pRxTs);ieee80211_send_DELBA ( ieee, - pRxTs->TsCommonInfo.addr, + pRxTs->ts_common_info.addr, &pRxTs->RxAdmittedBARecord,RX_DIR ,DELBA_REASON_TIMEOUT );
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +2 -2
@@ -27,7 +27,7 @@ struct ts_common_info { };struct tx_ts_record { -struct ts_common_info TsCommonInfo; +struct ts_common_info ts_common_info;u16 TxCurSeq;BA_RECORD TxPendingBARecord;/* For BA Originator */ BA_RECORD TxAdmittedBARecord;/* For BA Originator */
@@ -40,7 +40,7 @@ struct tx_ts_record { }; typedef struct _RX_TS_RECORD { - struct ts_common_info TsCommonInfo; + struct ts_common_info ts_common_info; u16 RxIndicateSeq; u16 RxTimeoutIndicateSeq; struct list_head RxPendingPktList;
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +10 -10
@@ -112,7 +112,7 @@ static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo)static void ResetTxTsEntry (struct tx_ts_record *pTS) { -ResetTsCommonInfo (&pTS->TsCommonInfo); +ResetTsCommonInfo (&pTS->ts_common_info); pTS->TxCurSeq =0 ; pTS->bAddBaReqInProgress = false; pTS->bAddBaReqDelayed = false;
@@ -123,7 +123,7 @@ static void ResetTxTsEntry(struct tx_ts_record *pTS)static void ResetRxTsEntry (PRX_TS_RECORD pTS) { -ResetTsCommonInfo (&pTS->TsCommonInfo); +ResetTsCommonInfo (&pTS->ts_common_info); pTS->RxIndicateSeq =0xffff ;// This indicate the RxIndicateSeq is not used now!! pTS->RxTimeoutIndicateSeq =0xffff ;// This indicate the RxTimeoutIndicateSeq is not used now!! ResetBaEntry (&pTS->RxAdmittedBARecord);// For BA Recipient
@@ -146,9 +146,9 @@ void TSInitialize(struct ieee80211_device *ieee) pTxTS->num = count;// The timers for the operation of Traffic Stream and Block Ack. // DLS related timer will be add here in the future!! -timer_setup (&pTxTS->TsCommonInfo.setup_timer, TsSetupTimeOut, +timer_setup (&pTxTS->ts_common_info.setup_timer, TsSetupTimeOut,0 ); -timer_setup (&pTxTS->TsCommonInfo.inact_timer, TsInactTimeout, +timer_setup (&pTxTS->ts_common_info.inact_timer, TsInactTimeout,0 );timer_setup (&pTxTS->TsAddBaTimer, TsAddBaProcess,0 ); timer_setup(&pTxTS->TxPendingBARecord.Timer, BaSetupTimeOut,
@@ -156,7 +156,7 @@ void TSInitialize(struct ieee80211_device *ieee)timer_setup (&pTxTS->TxAdmittedBARecord.Timer, TxBaInactTimeout,0 );ResetTxTsEntry (pTxTS); -list_add_tail (&pTxTS->TsCommonInfo.list, &ieee->Tx_TS_Unused_List); +list_add_tail (&pTxTS->ts_common_info.list, &ieee->Tx_TS_Unused_List); pTxTS++; }
@@ -167,15 +167,15 @@ void TSInitialize(struct ieee80211_device *ieee)for (count =0 ; count <TOTAL_TS_NUM ; count++) { pRxTS->num = count;INIT_LIST_HEAD (&pRxTS->RxPendingPktList); -timer_setup (&pRxTS->TsCommonInfo.setup_timer, TsSetupTimeOut, +timer_setup (&pRxTS->ts_common_info.setup_timer, TsSetupTimeOut,0 ); -timer_setup (&pRxTS->TsCommonInfo.inact_timer, TsInactTimeout, +timer_setup (&pRxTS->ts_common_info.inact_timer, TsInactTimeout,0 );timer_setup (&pRxTS->RxAdmittedBARecord.Timer, RxBaInactTimeout,0 );timer_setup (&pRxTS->RxPktPendingTimer, RxPktPendingTimeout,0 );ResetRxTsEntry (pRxTS); -list_add_tail (&pRxTS->TsCommonInfo.list, &ieee->Rx_TS_Unused_List); +list_add_tail (&pRxTS->ts_common_info.list, &ieee->Rx_TS_Unused_List); pRxTS++; }// Initialize unused Rx Reorder List.
@@ -374,10 +374,10 @@ bool GetTs( (*ppTS) = list_entry(pUnusedList->next, struct ts_common_info, list);list_del_init (&(*ppTS)->list);if (TxRxSelect==TX_DIR ) { - struct tx_ts_record *tmp = container_of(*ppTS, struct tx_ts_record, TsCommonInfo); + struct tx_ts_record *tmp = container_of(*ppTS, struct tx_ts_record, ts_common_info);ResetTxTsEntry (tmp); }else { -PRX_TS_RECORD tmp =container_of (*ppTS,RX_TS_RECORD , TsCommonInfo); +PRX_TS_RECORD tmp =container_of (*ppTS,RX_TS_RECORD , ts_common_info);ResetRxTsEntry (tmp); }
Signature · 1 line
2.18.0
PATCH 3/20 staging:rtl8192u: Rename TxCurSeq - Style
In reply to John WhitmoreRename the member variable TxCurSeq to tx_cur_seq. This change clears the checkpatch issue with CamelCase naming.
The changes are coding style changes which should not impact runtime code execution.
--- drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 4 ++-- drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 2 +- drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 +- drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +2 -2
@@ -342,7 +342,7 @@ static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee, }else if (!pTxTs->bUsingBa) { -if (SN_LESS (pTxTs->TxAdmittedBARecord.BaStartSeqCtrl.field.SeqNum, (pTxTs->TxCurSeq+1 )%4096 )) +if (SN_LESS (pTxTs->TxAdmittedBARecord.BaStartSeqCtrl.field.SeqNum, (pTxTs->tx_cur_seq +1 ) %4096 )) pTxTs->bUsingBa = true;else goto FORCED_AGG_SETTING;
@@ -589,7 +589,7 @@ static void ieee80211_query_seqnum(struct ieee80211_device *ieee, {return ; } - pTS->TxCurSeq = (pTS->TxCurSeq+1 )%4096 ; + pTS->tx_cur_seq = (pTS->tx_cur_seq +1 ) %4096 ; } }
drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c +1 -1
@@ -630,7 +630,7 @@ TsInitAddBA(// BufferSize: This need to be set according to A-MPDU vector pBA->BaParamSet.field.BufferSize =32 ;// BufferSize: This need to be set according to A-MPDU vector pBA->BaTimeoutValue =0 ;// Timeout value: Set 0 to disable Timer - pBA->BaStartSeqCtrl.field.SeqNum = (pTS->TxCurSeq +3 ) %4096 ;// Block Ack will start after 3 packets later. + pBA->BaStartSeqCtrl.field.SeqNum = (pTS->tx_cur_seq +3 ) %4096 ;// Block Ack will start after 3 packets later. ActivateBAEntry (ieee, pBA,BA_SETUP_TIMEOUT );
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +1 -1
@@ -28,7 +28,7 @@ struct ts_common_info {struct tx_ts_record {struct ts_common_info ts_common_info; -u16 TxCurSeq; +u16 tx_cur_seq;BA_RECORD TxPendingBARecord;/* For BA Originator */ BA_RECORD TxAdmittedBARecord;/* For BA Originator */ /* QOS_DL_RECORD DLRecord; */
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +1 -1
@@ -113,7 +113,7 @@ static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo)static void ResetTxTsEntry (struct tx_ts_record *pTS) {ResetTsCommonInfo (&pTS->ts_common_info); - pTS->TxCurSeq =0 ; + pTS->tx_cur_seq =0 ; pTS->bAddBaReqInProgress = false; pTS->bAddBaReqDelayed = false; pTS->bUsingBa = false;
Signature · 1 line
2.18.0
PATCH 4/20 staging:rtl8192u: Rename TxPendingBARecord - Style
In reply to John WhitmoreRename the member variable TxPendingBARecord to tx_pending_ba_record. This change clears the checkpatch issue with CamelCase naming.
The changes are purely coding style changes and should not impact runtime code execution.
--- drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 12 ++++++------ drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 +- drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c +6 -6
@@ -43,7 +43,7 @@ static void DeActivateBAEntry(struct ieee80211_device *ieee, PBA_RECORD pBA)static u8 TxTsDeleteBA (struct ieee80211_device *ieee,struct tx_ts_record *pTxTs) {PBA_RECORD pAdmittedBa = &pTxTs->TxAdmittedBARecord;//These two BA entries must exist in TS structure -PBA_RECORD pPendingBa = &pTxTs->TxPendingBARecord; +PBA_RECORD pPendingBa = &pTxTs->tx_pending_ba_record;u8 bSendDELBA = false;// Delete pending BA
@@ -470,7 +470,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb) } pTS->bAddBaReqInProgress = false; - pPendingBA = &pTS->TxPendingBARecord; + pPendingBA = &pTS->tx_pending_ba_record; pAdmittedBA = &pTS->TxAdmittedBARecord;
@@ -615,7 +615,7 @@ TsInitAddBA(u8 bOverwritePending ) { -PBA_RECORD pBA = &pTS->TxPendingBARecord; +PBA_RECORD pBA = &pTS->tx_pending_ba_record;if (pBA->bValid && !bOverwritePending)return ;
@@ -647,7 +647,7 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo,ieee80211_send_DELBA ( ieee, pTsCommonInfo->addr, - (pTxTs->TxAdmittedBARecord.bValid)?(&pTxTs->TxAdmittedBARecord):(&pTxTs->TxPendingBARecord), + (pTxTs->TxAdmittedBARecord.bValid)?(&pTxTs->TxAdmittedBARecord):(&pTxTs->tx_pending_ba_record), TxRxSelect,DELBA_REASON_END_BA ); }else if (TxRxSelect ==RX_DIR ) {
@@ -669,11 +669,11 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo,********************************************************************************************************************/ void BaSetupTimeOut (struct timer_list *t) { -struct tx_ts_record *pTxTs =from_timer (pTxTs, t, TxPendingBARecord.Timer); +struct tx_ts_record *pTxTs =from_timer (pTxTs, t, tx_pending_ba_record.Timer); pTxTs->bAddBaReqInProgress = false; pTxTs->bAddBaReqDelayed = true; - pTxTs->TxPendingBARecord.bValid = false; + pTxTs->tx_pending_ba_record.bValid = false; }void TxBaInactTimeout (struct timer_list *t)
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +1 -1
@@ -29,7 +29,7 @@ struct ts_common_info {struct tx_ts_record {struct ts_common_info ts_common_info;u16 tx_cur_seq; -BA_RECORD TxPendingBARecord;/* For BA Originator */ +BA_RECORD tx_pending_ba_record;/* For BA Originator */ BA_RECORD TxAdmittedBARecord;/* For BA Originator */ /* QOS_DL_RECORD DLRecord; */ u8 bAddBaReqInProgress;
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +2 -2
@@ -118,7 +118,7 @@ static void ResetTxTsEntry(struct tx_ts_record *pTS) pTS->bAddBaReqDelayed = false; pTS->bUsingBa = false;ResetBaEntry (&pTS->TxAdmittedBARecord);//For BA Originator -ResetBaEntry (&pTS->TxPendingBARecord); +ResetBaEntry (&pTS->tx_pending_ba_record); }static void ResetRxTsEntry (PRX_TS_RECORD pTS)
@@ -151,7 +151,7 @@ void TSInitialize(struct ieee80211_device *ieee)timer_setup (&pTxTS->ts_common_info.inact_timer, TsInactTimeout,0 );timer_setup (&pTxTS->TsAddBaTimer, TsAddBaProcess,0 ); -timer_setup (&pTxTS->TxPendingBARecord.Timer, BaSetupTimeOut, +timer_setup (&pTxTS->tx_pending_ba_record.Timer, BaSetupTimeOut,0 );timer_setup (&pTxTS->TxAdmittedBARecord.Timer, TxBaInactTimeout,0 );
Signature · 1 line
2.18.0
PATCH 5/20 staging:rtl8192u: Rename TxAdmittedBARecord - Style
In reply to John WhitmoreRename the member variable TxAdmittedBARecord to tx_admitted_ba_record This change clears the checkpatch issue with CamelCase naming.
The resulting changes are purely coding style changes which should not impact runtime code execution.
--- drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 4 ++-- drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 10 +++++----- drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 +- drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +2 -2
@@ -335,14 +335,14 @@ static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee,printk ("===>can't get TS\n" );return ; } -if (!pTxTs->TxAdmittedBARecord.bValid) +if (!pTxTs->tx_admitted_ba_record.bValid) {TsStartAddBaProcess (ieee, pTxTs); goto FORCED_AGG_SETTING; }else if (!pTxTs->bUsingBa) { -if (SN_LESS (pTxTs->TxAdmittedBARecord.BaStartSeqCtrl.field.SeqNum, (pTxTs->tx_cur_seq +1 ) %4096 )) +if (SN_LESS (pTxTs->tx_admitted_ba_record.BaStartSeqCtrl.field.SeqNum, (pTxTs->tx_cur_seq +1 ) %4096 )) pTxTs->bUsingBa = true;else goto FORCED_AGG_SETTING;
drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c +5 -5
@@ -42,7 +42,7 @@ static void DeActivateBAEntry(struct ieee80211_device *ieee, PBA_RECORD pBA)********************************************************************************************************************/ static u8 TxTsDeleteBA (struct ieee80211_device *ieee,struct tx_ts_record *pTxTs) { -PBA_RECORD pAdmittedBa = &pTxTs->TxAdmittedBARecord;//These two BA entries must exist in TS structure +PBA_RECORD pAdmittedBa = &pTxTs->tx_admitted_ba_record;//These two BA entries must exist in TS structure PBA_RECORD pPendingBa = &pTxTs->tx_pending_ba_record;u8 bSendDELBA = false;
@@ -471,7 +471,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb) pTS->bAddBaReqInProgress = false; pPendingBA = &pTS->tx_pending_ba_record; - pAdmittedBA = &pTS->TxAdmittedBARecord; + pAdmittedBA = &pTS->tx_admitted_ba_record;//
@@ -647,7 +647,7 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo,ieee80211_send_DELBA ( ieee, pTsCommonInfo->addr, - (pTxTs->TxAdmittedBARecord.bValid)?(&pTxTs->TxAdmittedBARecord):(&pTxTs->tx_pending_ba_record), + (pTxTs->tx_admitted_ba_record.bValid)?(&pTxTs->tx_admitted_ba_record):(&pTxTs->tx_pending_ba_record), TxRxSelect,DELBA_REASON_END_BA ); }else if (TxRxSelect ==RX_DIR ) {
@@ -678,13 +678,13 @@ void BaSetupTimeOut(struct timer_list *t)void TxBaInactTimeout (struct timer_list *t) { -struct tx_ts_record *pTxTs =from_timer (pTxTs, t, TxAdmittedBARecord.Timer); +struct tx_ts_record *pTxTs =from_timer (pTxTs, t, tx_admitted_ba_record.Timer); struct ieee80211_device *ieee = container_of(pTxTs, struct ieee80211_device, TxTsRecord[pTxTs->num]);TxTsDeleteBA (ieee, pTxTs);ieee80211_send_DELBA ( ieee, pTxTs->ts_common_info.addr, - &pTxTs->TxAdmittedBARecord, + &pTxTs->tx_admitted_ba_record,TX_DIR ,DELBA_REASON_TIMEOUT ); }
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +1 -1
@@ -30,7 +30,7 @@ struct tx_ts_record {struct ts_common_info ts_common_info;u16 tx_cur_seq;BA_RECORD tx_pending_ba_record;/* For BA Originator */ -BA_RECORD TxAdmittedBARecord;/* For BA Originator */ +BA_RECORD tx_admitted_ba_record;/* For BA Originator */ /* QOS_DL_RECORD DLRecord; */ u8 bAddBaReqInProgress;u8 bAddBaReqDelayed;
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +2 -2
@@ -117,7 +117,7 @@ static void ResetTxTsEntry(struct tx_ts_record *pTS) pTS->bAddBaReqInProgress = false; pTS->bAddBaReqDelayed = false; pTS->bUsingBa = false; -ResetBaEntry (&pTS->TxAdmittedBARecord);//For BA Originator +ResetBaEntry (&pTS->tx_admitted_ba_record);//For BA Originator ResetBaEntry (&pTS->tx_pending_ba_record); }
@@ -153,7 +153,7 @@ void TSInitialize(struct ieee80211_device *ieee)timer_setup (&pTxTS->TsAddBaTimer, TsAddBaProcess,0 );timer_setup (&pTxTS->tx_pending_ba_record.Timer, BaSetupTimeOut,0 ); -timer_setup (&pTxTS->TxAdmittedBARecord.Timer, +timer_setup (&pTxTS->tx_admitted_ba_record.Timer, TxBaInactTimeout,0 );ResetTxTsEntry (pTxTS);list_add_tail (&pTxTS->ts_common_info.list, &ieee->Tx_TS_Unused_List);
Signature · 1 line
2.18.0
PATCH 6/20 staging:rtl8192u: Rename bAddBaReqInProgress - Style
In reply to John WhitmoreRename the member variable bAddBaReqInProgress to add_ba_req_in_progress This change clears the checkpatch issue with CamelCase naming.
Changes are purely coding style and should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 6 +++--- drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 +- drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c +3 -3
@@ -469,7 +469,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb) goto OnADDBARsp_Reject; } - pTS->bAddBaReqInProgress = false; + pTS->add_ba_req_in_progress = false; pPendingBA = &pTS->tx_pending_ba_record; pAdmittedBA = &pTS->tx_admitted_ba_record;
@@ -595,7 +595,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb) } pTxTs->bUsingBa = false; - pTxTs->bAddBaReqInProgress = false; + pTxTs->add_ba_req_in_progress = false; pTxTs->bAddBaReqDelayed = false;del_timer_sync (&pTxTs->TsAddBaTimer);//PlatformCancelTimer(Adapter, &pTxTs->TsAddBaTimer);
@@ -671,7 +671,7 @@ void BaSetupTimeOut(struct timer_list *t) {struct tx_ts_record *pTxTs =from_timer (pTxTs, t, tx_pending_ba_record.Timer); - pTxTs->bAddBaReqInProgress = false; + pTxTs->add_ba_req_in_progress = false; pTxTs->bAddBaReqDelayed = true; pTxTs->tx_pending_ba_record.bValid = false; }
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +1 -1
@@ -32,7 +32,7 @@ struct tx_ts_record {BA_RECORD tx_pending_ba_record;/* For BA Originator */ BA_RECORD tx_admitted_ba_record;/* For BA Originator */ /* QOS_DL_RECORD DLRecord; */ -u8 bAddBaReqInProgress; +u8 add_ba_req_in_progress;u8 bAddBaReqDelayed;u8 bUsingBa;struct timer_list TsAddBaTimer;
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +3 -3
@@ -114,7 +114,7 @@ static void ResetTxTsEntry(struct tx_ts_record *pTS) {ResetTsCommonInfo (&pTS->ts_common_info); pTS->tx_cur_seq =0 ; - pTS->bAddBaReqInProgress = false; + pTS->add_ba_req_in_progress = false; pTS->bAddBaReqDelayed = false; pTS->bUsingBa = false;ResetBaEntry (&pTS->tx_admitted_ba_record);//For BA Originator
@@ -522,8 +522,8 @@ void RemoveAllTS(struct ieee80211_device *ieee)void TsStartAddBaProcess (struct ieee80211_device *ieee,struct tx_ts_record *pTxTS) { -if (!pTxTS->bAddBaReqInProgress) { - pTxTS->bAddBaReqInProgress = true; +if (!pTxTS->add_ba_req_in_progress) { + pTxTS->add_ba_req_in_progress = true;if (pTxTS->bAddBaReqDelayed) {IEEE80211_DEBUG (IEEE80211_DL_BA ,"TsStartAddBaProcess(): Delayed Start ADDBA after 60 sec!!\n" ); mod_timer(&pTxTS->TsAddBaTimer,
Signature · 1 line
2.18.0
PATCH 7/20 staging:rtl8192u: Rename bAddBaReqDelayed - Style
In reply to John WhitmoreRename the member variable bAddBaReqDelayed to add_ba_req_delayed This change clears the checkpatch issue with CamelCase naming.
The resulting changes are purely coding style changes which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 8 ++++---- drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 +- drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c +4 -4
@@ -500,7 +500,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)// if (pBaParamSet->field.BAPolicy ==BA_POLICY_DELAYED ) {// Since this is a kind of ADDBA failed, we delay next ADDBA process. - pTS->bAddBaReqDelayed = true; + pTS->add_ba_req_delayed = true;DeActivateBAEntry (ieee, pAdmittedBA); ReasonCode =DELBA_REASON_END_BA ; goto OnADDBARsp_Reject;
@@ -518,7 +518,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)ActivateBAEntry (ieee, pAdmittedBA, *pBaTimeoutVal); }else {// Delay next ADDBA process. - pTS->bAddBaReqDelayed = true; + pTS->add_ba_req_delayed = true; }// End of procedure
@@ -596,7 +596,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb) pTxTs->bUsingBa = false; pTxTs->add_ba_req_in_progress = false; - pTxTs->bAddBaReqDelayed = false; + pTxTs->add_ba_req_delayed = false;del_timer_sync (&pTxTs->TsAddBaTimer);//PlatformCancelTimer(Adapter, &pTxTs->TsAddBaTimer); TxTsDeleteBA (ieee, pTxTs);
@@ -672,7 +672,7 @@ void BaSetupTimeOut(struct timer_list *t)struct tx_ts_record *pTxTs =from_timer (pTxTs, t, tx_pending_ba_record.Timer); pTxTs->add_ba_req_in_progress = false; - pTxTs->bAddBaReqDelayed = true; + pTxTs->add_ba_req_delayed = true; pTxTs->tx_pending_ba_record.bValid = false; }
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +1 -1
@@ -33,7 +33,7 @@ struct tx_ts_record {BA_RECORD tx_admitted_ba_record;/* For BA Originator */ /* QOS_DL_RECORD DLRecord; */ u8 add_ba_req_in_progress; -u8 bAddBaReqDelayed; +u8 add_ba_req_delayed;u8 bUsingBa;struct timer_list TsAddBaTimer;u8 num;
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +2 -2
@@ -115,7 +115,7 @@ static void ResetTxTsEntry(struct tx_ts_record *pTS)ResetTsCommonInfo (&pTS->ts_common_info); pTS->tx_cur_seq =0 ; pTS->add_ba_req_in_progress = false; - pTS->bAddBaReqDelayed = false; + pTS->add_ba_req_delayed = false; pTS->bUsingBa = false;ResetBaEntry (&pTS->tx_admitted_ba_record);//For BA Originator ResetBaEntry (&pTS->tx_pending_ba_record);
@@ -524,7 +524,7 @@ void TsStartAddBaProcess(struct ieee80211_device *ieee, struct tx_ts_record *pTx {if (!pTxTS->add_ba_req_in_progress) { pTxTS->add_ba_req_in_progress = true; -if (pTxTS->bAddBaReqDelayed) { +if (pTxTS->add_ba_req_delayed) {IEEE80211_DEBUG (IEEE80211_DL_BA ,"TsStartAddBaProcess(): Delayed Start ADDBA after 60 sec!!\n" );mod_timer (&pTxTS->TsAddBaTimer, jiffies +msecs_to_jiffies (TS_ADDBA_DELAY ));
Signature · 1 line
2.18.0
PATCH 8/20 staging:rtl8192u: Rename bUsingBa - Style
In reply to John WhitmoreRename the member variable bUsingBa to using_ba. This change clears the checkpatch issue with CamelCase naming.
The resulting changes are purely coding style and should not impact runtime code execution.
--- drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 4 ++-- drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 2 +- drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 +- drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +2 -2
@@ -340,10 +340,10 @@ static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee,TsStartAddBaProcess (ieee, pTxTs); goto FORCED_AGG_SETTING; } -else if (!pTxTs->bUsingBa) +else if (!pTxTs->using_ba) {if (SN_LESS (pTxTs->tx_admitted_ba_record.BaStartSeqCtrl.field.SeqNum, (pTxTs->tx_cur_seq +1 ) %4096 )) - pTxTs->bUsingBa = true; + pTxTs->using_ba = true;else goto FORCED_AGG_SETTING; }
drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c +1 -1
@@ -594,7 +594,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb)return -1 ; } - pTxTs->bUsingBa = false; + pTxTs->using_ba = false; pTxTs->add_ba_req_in_progress = false; pTxTs->add_ba_req_delayed = false;del_timer_sync (&pTxTs->TsAddBaTimer);
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +1 -1
@@ -34,7 +34,7 @@ struct tx_ts_record {/* QOS_DL_RECORD DLRecord; */ u8 add_ba_req_in_progress;u8 add_ba_req_delayed; -u8 bUsingBa; +u8 using_ba;struct timer_list TsAddBaTimer;u8 num; };
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +1 -1
@@ -116,7 +116,7 @@ static void ResetTxTsEntry(struct tx_ts_record *pTS) pTS->tx_cur_seq =0 ; pTS->add_ba_req_in_progress = false; pTS->add_ba_req_delayed = false; - pTS->bUsingBa = false; + pTS->using_ba = false;ResetBaEntry (&pTS->tx_admitted_ba_record);//For BA Originator ResetBaEntry (&pTS->tx_pending_ba_record); }
Signature · 1 line
2.18.0
PATCH 9/20 staging:rtl8192u: Rename TsAddBaTimer - Style
In reply to John WhitmoreRename the member variable TsAddBaTimer to ts_add_ba_timer. This change clears the checkpatch issue with CamelCase naming.
The resulting changes are coding style in nature and as such should not have any impact on runtime code execution.
--- drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 4 ++-- drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 +- drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c +2 -2
@@ -597,8 +597,8 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb) pTxTs->using_ba = false; pTxTs->add_ba_req_in_progress = false; pTxTs->add_ba_req_delayed = false; -del_timer_sync (&pTxTs->TsAddBaTimer); -//PlatformCancelTimer(Adapter, &pTxTs->TsAddBaTimer); +del_timer_sync (&pTxTs->ts_add_ba_timer); +//PlatformCancelTimer(Adapter, &pTxTs->ts_add_ba_timer); TxTsDeleteBA (ieee, pTxTs); }return 0 ;
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +1 -1
@@ -35,7 +35,7 @@ struct tx_ts_record {u8 add_ba_req_in_progress;u8 add_ba_req_delayed;u8 using_ba; -struct timer_list TsAddBaTimer; +struct timer_list ts_add_ba_timer;u8 num; };
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +5 -5
@@ -92,7 +92,7 @@ static void RxPktPendingTimeout(struct timer_list *t)********************************************************************************************************************/ static void TsAddBaProcess (struct timer_list *t) { -struct tx_ts_record *pTxTs =from_timer (pTxTs, t, TsAddBaTimer); +struct tx_ts_record *pTxTs =from_timer (pTxTs, t, ts_add_ba_timer);u8 num = pTxTs->num; struct ieee80211_device *ieee = container_of(pTxTs, struct ieee80211_device, TxTsRecord[num]);
@@ -150,7 +150,7 @@ void TSInitialize(struct ieee80211_device *ieee) 0);timer_setup (&pTxTS->ts_common_info.inact_timer, TsInactTimeout,0 ); -timer_setup (&pTxTS->TsAddBaTimer, TsAddBaProcess,0 ); +timer_setup (&pTxTS->ts_add_ba_timer, TsAddBaProcess,0 );timer_setup (&pTxTS->tx_pending_ba_record.Timer, BaSetupTimeOut,0 ); timer_setup(&pTxTS->tx_admitted_ba_record.Timer,
@@ -448,7 +448,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info *//#endif }else {struct tx_ts_record *pTxTS = (struct tx_ts_record *)pTs; -del_timer_sync (&pTxTS->TsAddBaTimer); +del_timer_sync (&pTxTS->ts_add_ba_timer); } }
@@ -526,11 +526,11 @@ void TsStartAddBaProcess(struct ieee80211_device *ieee, struct tx_ts_record *pTx pTxTS->add_ba_req_in_progress = true;if (pTxTS->add_ba_req_delayed) {IEEE80211_DEBUG (IEEE80211_DL_BA ,"TsStartAddBaProcess(): Delayed Start ADDBA after 60 sec!!\n" ); -mod_timer (&pTxTS->TsAddBaTimer, +mod_timer (&pTxTS->ts_add_ba_timer, jiffies +msecs_to_jiffies (TS_ADDBA_DELAY )); }else {IEEE80211_DEBUG (IEEE80211_DL_BA ,"TsStartAddBaProcess(): Immediately Start ADDBA now!!\n" ); -mod_timer (&pTxTS->TsAddBaTimer, jiffies+10 );//set 10 ticks +mod_timer (&pTxTS->ts_add_ba_timer, jiffies+10 );//set 10 ticks } }else {IEEE80211_DEBUG (IEEE80211_DL_ERR ,"%s()==>BA timer is already added\n" , __func__);
Signature · 1 line
2.18.0
PATCH 10/20 staging:rtl8192u: Remove typedef and rename RX_TS_RECORD - Style
In reply to John WhitmoreRemove the typedef from structure RX_TS_RECORD, this change clears the checkpatch issue with creation of new types.
Additionally the structure is renamed from RX_TS_RECORD to rx_ts_record. Whilst this is not raised as a checkpatch error structures are meant to be named in lower case.
These changes are coding style changes which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2 +- .../staging/rtl8192u/ieee80211/ieee80211_rx.c | 8 ++++---- .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 16 ++++++++-------- drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 4 ++-- .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 14 +++++++------- 5 files changed, 22 insertions(+), 22 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211.h +1 -1
@@ -1651,7 +1651,7 @@ struct ieee80211_device {struct list_head Rx_TS_Admit_List;struct list_head Rx_TS_Pending_List;struct list_head Rx_TS_Unused_List; -RX_TS_RECORD RxTsRecord[TOTAL_TS_NUM ]; +struct rx_ts_record RxTsRecord[TOTAL_TS_NUM ];//#ifdef TO_DO_LIST RX_REORDER_ENTRY RxReorderEntry[128 ];struct list_head RxReorder_Unused_List;
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +4 -4
@@ -508,7 +508,7 @@ static int is_duplicate_packet(struct ieee80211_device *ieee,return 1 ; } -static bool AddReorderEntry (PRX_TS_RECORD pTS,PRX_REORDER_ENTRY pReorderEntry) +static bool AddReorderEntry (struct rx_ts_record *pTS,PRX_REORDER_ENTRY pReorderEntry) {struct list_head *pList = &pTS->RxPendingPktList;while (pList->next != &pTS->RxPendingPktList)
@@ -586,7 +586,7 @@ void ieee80211_indicate_packets(struct ieee80211_device *ieee, struct ieee80211_static void RxReorderIndicatePacket (struct ieee80211_device *ieee,struct ieee80211_rxb *prxb, -PRX_TS_RECORD pTS,u16 SeqNum) +struct rx_ts_record *pTS,u16 SeqNum) {PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;PRX_REORDER_ENTRY pReorderEntry =NULL ;
@@ -898,7 +898,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,//added by amy for reorder u8 TID =0 ;u16 SeqNum =0 ; -PRX_TS_RECORD pTS =NULL ; +struct rx_ts_record *pTS =NULL ;//bool bIsAggregateFrame = false; //added by amy for reorder #ifdef NOT_YET
@@ -1017,7 +1017,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, }else { -PRX_TS_RECORD pRxTS =NULL ; +struct rx_ts_record *pRxTS =NULL ;//IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): QOS ENABLE AND RECEIVE QOS DATA , we will get Ts, tid:%d\n",__func__, tid); if(GetTs( ieee,
drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c +8 -8
@@ -64,11 +64,11 @@ static u8 TxTsDeleteBA(struct ieee80211_device *ieee, struct tx_ts_record *pTxTs/******************************************************************************************************************** *function: deactivete BA entry in Tx Ts, and send DELBA. * input: -* PRX_TS_RECORD pRxTs //Rx Ts which is to deactivate BA entry. +* struct rx_ts_record *pRxTs //Rx Ts which is to deactivate BA entry. * output: none -* notice: As PRX_TS_RECORD structure will be defined in QOS, so wait to be merged. //FIXME, same with above +* notice: As struct rx_ts_record * structure will be defined in QOS, so wait to be merged. //FIXME, same with above ********************************************************************************************************************/ -static u8 RxTsDeleteBA (struct ieee80211_device *ieee,PRX_TS_RECORD pRxTs) +static u8 RxTsDeleteBA (struct ieee80211_device *ieee,struct rx_ts_record *pRxTs) {PBA_RECORD pBa = &pRxTs->RxAdmittedBARecord;u8 bSendDELBA = false;
@@ -325,7 +325,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)PBA_PARAM_SET pBaParamSet =NULL ;u16 *pBaTimeoutVal =NULL ;PSEQUENCE_CONTROL pBaStartSeqCtrl =NULL ; -PRX_TS_RECORD pTS =NULL ; +struct rx_ts_record *pTS =NULL ;if (skb->len <sizeof (struct rtl_80211_hdr_3addr ) +9 ) { IEEE80211_DEBUG(IEEE80211_DL_ERR,
@@ -566,7 +566,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb) pDelBaParamSet = (PDELBA_PARAM_SET )&delba->payload[2 ]; if (pDelBaParamSet->field.Initiator == 1) { - PRX_TS_RECORD pRxTs; + struct rx_ts_record *pRxTs; if (!GetTs( ieee,
@@ -651,7 +651,7 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo, TxRxSelect, DELBA_REASON_END_BA); }else if (TxRxSelect ==RX_DIR ) { -PRX_TS_RECORD pRxTs = (PRX_TS_RECORD )pTsCommonInfo; +struct rx_ts_record *pRxTs = (struct rx_ts_record *)pTsCommonInfo;if (RxTsDeleteBA (ieee, pRxTs)) ieee80211_send_DELBA( ieee,
@@ -663,7 +663,7 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo, }/******************************************************************************************************************** *function: BA setup timer -* input: unsigned long data //acturally we send struct tx_ts_record or RX_TS_RECORD to these timer +* input: unsigned long data //acturally we send struct tx_ts_record or struct rx_ts_record to these timer * return: NULL * notice: ********************************************************************************************************************/
@@ -691,7 +691,7 @@ void TxBaInactTimeout(struct timer_list *t)void RxBaInactTimeout (struct timer_list *t) { -PRX_TS_RECORD pRxTs =from_timer (pRxTs, t, RxAdmittedBARecord.Timer); +struct rx_ts_record *pRxTs =from_timer (pRxTs, t, RxAdmittedBARecord.Timer); struct ieee80211_device *ieee = container_of(pRxTs, struct ieee80211_device, RxTsRecord[pRxTs->num]);RxTsDeleteBA (ieee, pRxTs);
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +2 -2
@@ -39,7 +39,7 @@ struct tx_ts_record {u8 num; }; -typedef struct _RX_TS_RECORD { +struct rx_ts_record {struct ts_common_info ts_common_info;u16 RxIndicateSeq;u16 RxTimeoutIndicateSeq;
@@ -50,7 +50,7 @@ typedef struct _RX_TS_RECORD {u8 RxLastFragNum;u8 num; /* QOS_DL_RECORD DLRecord; */ -}RX_TS_RECORD , *PRX_TS_RECORD ; +};#endif
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +7 -7
@@ -19,13 +19,13 @@ static void TsInactTimeout(struct timer_list *unused)/******************************************************************************************************************** *function: I still not understand this function, so wait for further implementation -* input: unsigned long data //acturally we send struct tx_ts_record or RX_TS_RECORD to these timer +* input: unsigned long data //acturally we send struct tx_ts_record or struct rx_ts_record to these timer * return: NULL * notice: ********************************************************************************************************************/ static void RxPktPendingTimeout (struct timer_list *t) { -PRX_TS_RECORD pRxTs =from_timer (pRxTs, t, RxPktPendingTimer); +struct rx_ts_record *pRxTs =from_timer (pRxTs, t, RxPktPendingTimer); struct ieee80211_device *ieee = container_of(pRxTs, struct ieee80211_device, RxTsRecord[pRxTs->num]);PRX_REORDER_ENTRY pReorderEntry =NULL ;
@@ -86,7 +86,7 @@ static void RxPktPendingTimeout(struct timer_list *t)/******************************************************************************************************************** *function: Add BA timer function -* input: unsigned long data //acturally we send struct tx_ts_record or RX_TS_RECORD to these timer +* input: unsigned long data //acturally we send struct tx_ts_record or struct rx_ts_record to these timer * return: NULL * notice: ********************************************************************************************************************/
@@ -121,7 +121,7 @@ static void ResetTxTsEntry(struct tx_ts_record *pTS)ResetBaEntry (&pTS->tx_pending_ba_record); } -static void ResetRxTsEntry (PRX_TS_RECORD pTS) +static void ResetRxTsEntry (struct rx_ts_record *pTS) {ResetTsCommonInfo (&pTS->ts_common_info); pTS->RxIndicateSeq =0xffff ;// This indicate the RxIndicateSeq is not used now!!
@@ -132,7 +132,7 @@ static void ResetRxTsEntry(PRX_TS_RECORD pTS)void TSInitialize (struct ieee80211_device *ieee) {struct tx_ts_record *pTxTS = ieee->TxTsRecord; -PRX_TS_RECORD pRxTS = ieee->RxTsRecord; +struct rx_ts_record *pRxTS = ieee->RxTsRecord;PRX_REORDER_ENTRY pRxReorderEntry = ieee->RxReorderEntry;u8 count =0 ;IEEE80211_DEBUG (IEEE80211_DL_TS ,"==========>%s()\n" , __func__);
@@ -377,7 +377,7 @@ bool GetTs( struct tx_ts_record *tmp = container_of(*ppTS, struct tx_ts_record, ts_common_info);ResetTxTsEntry (tmp); }else { -PRX_TS_RECORD tmp =container_of (*ppTS,RX_TS_RECORD , ts_common_info); + struct rx_ts_record *tmp = container_of(*ppTS, struct rx_ts_record, ts_common_info);ResetRxTsEntry (tmp); }
@@ -419,7 +419,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info *if (TxRxSelect ==RX_DIR ) {//#ifdef TO_DO_LIST PRX_REORDER_ENTRY pRxReorderEntry; -PRX_TS_RECORD pRxTS = (PRX_TS_RECORD )pTs; +struct rx_ts_record *pRxTS = (struct rx_ts_record *)pTs;if (timer_pending (&pRxTS->RxPktPendingTimer))del_timer_sync (&pRxTS->RxPktPendingTimer);
Signature · 1 line
2.18.0
PATCH 11/20 staging:rtl8192u: Remove commented out code - Style
In reply to John WhitmoreRemove commented out sections of code, specifically for a structure, QOS_DL_RECORD, which no longer exists in the module.
This change is a coding style change which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +0 -2
@@ -31,7 +31,6 @@ struct tx_ts_record {u16 tx_cur_seq;BA_RECORD tx_pending_ba_record;/* For BA Originator */ BA_RECORD tx_admitted_ba_record;/* For BA Originator */ -/* QOS_DL_RECORD DLRecord; */ u8 add_ba_req_in_progress;u8 add_ba_req_delayed;u8 using_ba;
@@ -49,7 +48,6 @@ struct rx_ts_record {u16 RxLastSeqNum;u8 RxLastFragNum;u8 num; -/* QOS_DL_RECORD DLRecord; */ };
Signature · 1 line
2.18.0
PATCH 12/20 staging:rtl8192u: Remove unused timer values - Style
In reply to John WhitmoreRemove the unused timer constants TS_SETUP_TIMEOUT and TS_INACT_TIMEOUT as neither are used in code.
This is a style change which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +1 -2
@@ -2,8 +2,7 @@#ifndef _TSTYPE_H_#define _TSTYPE_H_#include "rtl819x_Qos.h" -#define TS_SETUP_TIMEOUT 60/* In millisecond */ -#define TS_INACT_TIMEOUT 60 +#define TS_ADDBA_DELAY 60#define TOTAL_TS_NUM 16
Signature · 1 line
2.18.0
PATCH 13/20 staging:rtl8192u: Rename RxIndicateSeq - Style
In reply to John WhitmoreRename the member variable RxIndicateSeq to rx_indicate_seq. This change clears the checkpatch issue with CamelCase naming.
The resulting changes are purely coding style changes which should have no impact on runtime code execution.
--- .../staging/rtl8192u/ieee80211/ieee80211_rx.c | 40 +++++++++---------- .../staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 +- .../rtl8192u/ieee80211/rtl819x_TSProc.c | 14 +++---- 3 files changed, 28 insertions(+), 28 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +20 -20
@@ -592,10 +592,10 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,PRX_REORDER_ENTRY pReorderEntry =NULL ;struct ieee80211_rxb **prxbIndicateArray;u8 WinSize = pHTInfo->RxReorderWinSize; -u16 WinEnd = (pTS->RxIndicateSeq + WinSize -1 )%4096 ; +u16 WinEnd = (pTS->rx_indicate_seq + WinSize -1 ) %4096 ;u8 index =0 ;bool bMatchWinStart = false, bPktInBuf = false; -IEEE80211_DEBUG (IEEE80211_DL_REORDER ,"%s(): Seq is %d,pTS->RxIndicateSeq is %d, WinSize is %d\n" ,__func__,SeqNum,pTS->RxIndicateSeq,WinSize); +IEEE80211_DEBUG (IEEE80211_DL_REORDER ,"%s(): Seq is %d,pTS->rx_indicate_seq is %d, WinSize is %d\n" ,__func__,SeqNum,pTS->rx_indicate_seq,WinSize); prxbIndicateArray = kmalloc_array(REORDER_WIN_SIZE, sizeof(struct ieee80211_rxb *),
@@ -604,14 +604,14 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,return ;/* Rx Reorder initialize condition.*/ -if (pTS->RxIndicateSeq ==0xffff ) { - pTS->RxIndicateSeq = SeqNum; +if (pTS->rx_indicate_seq ==0xffff ) { + pTS->rx_indicate_seq = SeqNum; }/* Drop out the packet which SeqNum is smaller than WinStart */ -if (SN_LESS (SeqNum, pTS->RxIndicateSeq)) { +if (SN_LESS (SeqNum, pTS->rx_indicate_seq)) {IEEE80211_DEBUG (IEEE80211_DL_REORDER ,"Packet Drop! IndicateSeq: %d, NewSeq: %d\n" , - pTS->RxIndicateSeq, SeqNum); + pTS->rx_indicate_seq, SeqNum); pHTInfo->RxReorderDropCounter++; {int i;
@@ -631,16 +631,16 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,* 1. Incoming SeqNum is equal to WinStart =>Window shift 1 * 2. Incoming SeqNum is larger than the WinEnd => Window shift N */ -if (SN_EQUAL (SeqNum, pTS->RxIndicateSeq)) { - pTS->RxIndicateSeq = (pTS->RxIndicateSeq +1 ) %4096 ; +if (SN_EQUAL (SeqNum, pTS->rx_indicate_seq)) { + pTS->rx_indicate_seq = (pTS->rx_indicate_seq +1 ) %4096 ; bMatchWinStart = true; }else if (SN_LESS (WinEnd, SeqNum)) {if (SeqNum >= (WinSize -1 )) { - pTS->RxIndicateSeq = SeqNum +1 -WinSize; + pTS->rx_indicate_seq = SeqNum +1 -WinSize; }else { - pTS->RxIndicateSeq =4095 - (WinSize - (SeqNum +1 )) +1 ; + pTS->rx_indicate_seq =4095 - (WinSize - (SeqNum +1 )) +1 ; } -IEEE80211_DEBUG (IEEE80211_DL_REORDER ,"Window Shift! IndicateSeq: %d, NewSeq: %d\n" ,pTS->RxIndicateSeq, SeqNum); +IEEE80211_DEBUG (IEEE80211_DL_REORDER ,"Window Shift! IndicateSeq: %d, NewSeq: %d\n" ,pTS->rx_indicate_seq, SeqNum); }/*
@@ -655,7 +655,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,if (bMatchWinStart) {/* Current packet is going to be indicated.*/ IEEE80211_DEBUG (IEEE80211_DL_REORDER ,"Packets indication!! IndicateSeq: %d, NewSeq: %d\n" ,\ - pTS->RxIndicateSeq, SeqNum); + pTS->rx_indicate_seq, SeqNum); prxbIndicateArray[0 ] = prxb;// printk("========================>%s(): SeqNum is %d\n",__func__,SeqNum); index =1 ;
@@ -673,7 +673,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,if (!AddReorderEntry (pTS, pReorderEntry)) {IEEE80211_DEBUG (IEEE80211_DL_REORDER ,"%s(): Duplicate packet is dropped!! IndicateSeq: %d, NewSeq: %d\n" , - __func__, pTS->RxIndicateSeq, SeqNum); + __func__, pTS->rx_indicate_seq, SeqNum);list_add_tail (&pReorderEntry->List,&ieee->RxReorder_Unused_List); {int i;
@@ -685,7 +685,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, } }else {IEEE80211_DEBUG (IEEE80211_DL_REORDER , -"Pkt insert into buffer!! IndicateSeq: %d, NewSeq: %d\n" ,pTS->RxIndicateSeq, SeqNum); +"Pkt insert into buffer!! IndicateSeq: %d, NewSeq: %d\n" ,pTS->rx_indicate_seq, SeqNum); } }else {
@@ -710,8 +710,8 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,while (!list_empty (&pTS->RxPendingPktList)) {IEEE80211_DEBUG (IEEE80211_DL_REORDER ,"%s(): start RREORDER indicate\n" ,__func__); pReorderEntry = (PRX_REORDER_ENTRY )list_entry (pTS->RxPendingPktList.prev,RX_REORDER_ENTRY ,List); -if (SN_LESS (pReorderEntry->SeqNum, pTS->RxIndicateSeq) || -SN_EQUAL (pReorderEntry->SeqNum, pTS->RxIndicateSeq)) +if (SN_LESS (pReorderEntry->SeqNum, pTS->rx_indicate_seq) || +SN_EQUAL (pReorderEntry->SeqNum, pTS->rx_indicate_seq)) {/* This protect buffer from overflow. */ if (index >=REORDER_WIN_SIZE ) {
@@ -722,10 +722,10 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,list_del_init (&pReorderEntry->List); -if (SN_EQUAL (pReorderEntry->SeqNum, pTS->RxIndicateSeq)) - pTS->RxIndicateSeq = (pTS->RxIndicateSeq +1 ) %4096 ; +if (SN_EQUAL (pReorderEntry->SeqNum, pTS->rx_indicate_seq)) + pTS->rx_indicate_seq = (pTS->rx_indicate_seq +1 ) %4096 ; -IEEE80211_DEBUG (IEEE80211_DL_REORDER ,"Packets indication!! IndicateSeq: %d, NewSeq: %d\n" ,pTS->RxIndicateSeq, SeqNum); +IEEE80211_DEBUG (IEEE80211_DL_REORDER ,"Packets indication!! IndicateSeq: %d, NewSeq: %d\n" ,pTS->rx_indicate_seq, SeqNum); prxbIndicateArray[index] = pReorderEntry->prxb;// printk("========================>%s(): pReorderEntry->SeqNum is %d\n",__func__,pReorderEntry->SeqNum); index++;
@@ -755,7 +755,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,if (bPktInBuf && pTS->RxTimeoutIndicateSeq==0xffff ) {// Set new pending timer. IEEE80211_DEBUG (IEEE80211_DL_REORDER ,"%s(): SET rx timeout timer\n" , __func__); - pTS->RxTimeoutIndicateSeq = pTS->RxIndicateSeq; + pTS->RxTimeoutIndicateSeq = pTS->rx_indicate_seq;if (timer_pending (&pTS->RxPktPendingTimer))del_timer_sync (&pTS->RxPktPendingTimer); pTS->RxPktPendingTimer.expires = jiffies +
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +1 -1
@@ -39,7 +39,7 @@ struct tx_ts_record {struct rx_ts_record {struct ts_common_info ts_common_info; -u16 RxIndicateSeq; +u16 rx_indicate_seq;u16 RxTimeoutIndicateSeq;struct list_head RxPendingPktList;struct timer_list RxPktPendingTimer;
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +7 -7
@@ -42,14 +42,14 @@ static void RxPktPendingTimeout(struct timer_list *t)while (!list_empty (&pRxTs->RxPendingPktList)) { pReorderEntry = (PRX_REORDER_ENTRY )list_entry (pRxTs->RxPendingPktList.prev,RX_REORDER_ENTRY ,List);if (index ==0 ) - pRxTs->RxIndicateSeq = pReorderEntry->SeqNum; + pRxTs->rx_indicate_seq = pReorderEntry->SeqNum; -if (SN_LESS (pReorderEntry->SeqNum, pRxTs->RxIndicateSeq) || -SN_EQUAL (pReorderEntry->SeqNum, pRxTs->RxIndicateSeq) ) { +if (SN_LESS (pReorderEntry->SeqNum, pRxTs->rx_indicate_seq) || +SN_EQUAL (pReorderEntry->SeqNum, pRxTs->rx_indicate_seq) ) {list_del_init (&pReorderEntry->List); -if (SN_EQUAL (pReorderEntry->SeqNum, pRxTs->RxIndicateSeq)) - pRxTs->RxIndicateSeq = (pRxTs->RxIndicateSeq +1 ) %4096 ; +if (SN_EQUAL (pReorderEntry->SeqNum, pRxTs->rx_indicate_seq)) + pRxTs->rx_indicate_seq = (pRxTs->rx_indicate_seq +1 ) %4096 ;IEEE80211_DEBUG (IEEE80211_DL_REORDER ,"RxPktPendingTimeout(): IndicateSeq: %d\n" , pReorderEntry->SeqNum); ieee->stats_IndicateArray[index] = pReorderEntry->prxb;
@@ -77,7 +77,7 @@ static void RxPktPendingTimeout(struct timer_list *t) }if (bPktInBuf && (pRxTs->RxTimeoutIndicateSeq==0xffff )) { - pRxTs->RxTimeoutIndicateSeq = pRxTs->RxIndicateSeq; + pRxTs->RxTimeoutIndicateSeq = pRxTs->rx_indicate_seq;mod_timer (&pRxTs->RxPktPendingTimer, jiffies +msecs_to_jiffies (ieee->pHTInfo->RxReorderPendingTime)); }
@@ -124,7 +124,7 @@ static void ResetTxTsEntry(struct tx_ts_record *pTS)static void ResetRxTsEntry (struct rx_ts_record *pTS) {ResetTsCommonInfo (&pTS->ts_common_info); - pTS->RxIndicateSeq =0xffff ;// This indicate the RxIndicateSeq is not used now!! + pTS->rx_indicate_seq =0xffff ;// This indicate the rx_indicate_seq is not used now!! pTS->RxTimeoutIndicateSeq =0xffff ;// This indicate the RxTimeoutIndicateSeq is not used now!! ResetBaEntry (&pTS->RxAdmittedBARecord);// For BA Recipient }
Signature · 1 line
2.18.0
PATCH 14/20 staging:rtl8192u: Rename RxTimeoutIndicateSeq _Style
In reply to John WhitmoreRename member variable RxTimeoutIndicateSeq to rx_timeout_indicate_seq. This change clears the checkpatch issue with CamelCase naming.
The resulting changes are purely coding style in nature and should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 6 +++--- drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 +- drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +3 -3
@@ -741,7 +741,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,if (index>0 ) {// Cancel previous pending timer. // del_timer_sync(&pTS->RxPktPendingTimer); - pTS->RxTimeoutIndicateSeq =0xffff ; + pTS->rx_timeout_indicate_seq =0xffff ;// Indicate packets if (index>REORDER_WIN_SIZE ){
@@ -752,10 +752,10 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,ieee80211_indicate_packets (ieee, prxbIndicateArray, index); } -if (bPktInBuf && pTS->RxTimeoutIndicateSeq==0xffff ) { +if (bPktInBuf && pTS->rx_timeout_indicate_seq ==0xffff ) {// Set new pending timer. IEEE80211_DEBUG (IEEE80211_DL_REORDER ,"%s(): SET rx timeout timer\n" , __func__); - pTS->RxTimeoutIndicateSeq = pTS->rx_indicate_seq; + pTS->rx_timeout_indicate_seq = pTS->rx_indicate_seq;if (timer_pending (&pTS->RxPktPendingTimer))del_timer_sync (&pTS->RxPktPendingTimer); pTS->RxPktPendingTimer.expires = jiffies +
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +1 -1
@@ -40,7 +40,7 @@ struct tx_ts_record {struct rx_ts_record {struct ts_common_info ts_common_info;u16 rx_indicate_seq; -u16 RxTimeoutIndicateSeq; +u16 rx_timeout_indicate_seq;struct list_head RxPendingPktList;struct timer_list RxPktPendingTimer;BA_RECORD RxAdmittedBARecord;/* For BA Recipient */
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +6 -6
@@ -37,7 +37,7 @@ static void RxPktPendingTimeout(struct timer_list *t)spin_lock_irqsave (&(ieee->reorder_spinlock), flags);IEEE80211_DEBUG (IEEE80211_DL_REORDER ,"==================>%s()\n" ,__func__); -if (pRxTs->RxTimeoutIndicateSeq !=0xffff ) { +if (pRxTs->rx_timeout_indicate_seq !=0xffff ) {// Indicate the pending packets sequentially according to SeqNum until meet the gap. while (!list_empty (&pRxTs->RxPendingPktList)) { pReorderEntry = (PRX_REORDER_ENTRY )list_entry (pRxTs->RxPendingPktList.prev,RX_REORDER_ENTRY ,List);
@@ -64,8 +64,8 @@ static void RxPktPendingTimeout(struct timer_list *t) }if (index>0 ) { -// Set RxTimeoutIndicateSeq to 0xffff to indicate no pending packets in buffer now. - pRxTs->RxTimeoutIndicateSeq =0xffff ; +// Set rx_timeout_indicate_seq to 0xffff to indicate no pending packets in buffer now. + pRxTs->rx_timeout_indicate_seq =0xffff ;// Indicate packets if (index >REORDER_WIN_SIZE ) {
@@ -76,8 +76,8 @@ static void RxPktPendingTimeout(struct timer_list *t)ieee80211_indicate_packets (ieee, ieee->stats_IndicateArray, index); } -if (bPktInBuf && (pRxTs->RxTimeoutIndicateSeq==0xffff )) { - pRxTs->RxTimeoutIndicateSeq = pRxTs->rx_indicate_seq; +if (bPktInBuf && (pRxTs->rx_timeout_indicate_seq ==0xffff )) { + pRxTs->rx_timeout_indicate_seq = pRxTs->rx_indicate_seq;mod_timer (&pRxTs->RxPktPendingTimer, jiffies +msecs_to_jiffies (ieee->pHTInfo->RxReorderPendingTime)); }
@@ -125,7 +125,7 @@ static void ResetRxTsEntry(struct rx_ts_record *pTS) {ResetTsCommonInfo (&pTS->ts_common_info); pTS->rx_indicate_seq =0xffff ;// This indicate the rx_indicate_seq is not used now!! - pTS->RxTimeoutIndicateSeq =0xffff ;// This indicate the RxTimeoutIndicateSeq is not used now!! + pTS->rx_timeout_indicate_seq =0xffff ;// This indicate the rx_timeout_indicate_seq is not used now!! ResetBaEntry (&pTS->RxAdmittedBARecord);// For BA Recipient }
Signature · 1 line
2.18.0
PATCH 15/20 staging:rtl8192u: Rename RxPendingPktList - Style
In reply to John WhitmoreRename the member variable RxPendingPktList to rx_pending_pkt_list. This change resolves the checkpatch issue with CamelCase naming.
The resulting changes are purely coding style changes which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 8 ++++---- drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 +- drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +4 -4
@@ -510,8 +510,8 @@ static int is_duplicate_packet(struct ieee80211_device *ieee,static bool AddReorderEntry (struct rx_ts_record *pTS,PRX_REORDER_ENTRY pReorderEntry) { -struct list_head *pList = &pTS->RxPendingPktList; -while (pList->next != &pTS->RxPendingPktList) +struct list_head *pList = &pTS->rx_pending_pkt_list; +while (pList->next != &pTS->rx_pending_pkt_list) {if (SN_LESS (pReorderEntry->SeqNum, ((PRX_REORDER_ENTRY )list_entry (pList->next,RX_REORDER_ENTRY ,List))->SeqNum) ) {
@@ -707,9 +707,9 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, }/* Check if there is any packet need indicate.*/ -while (!list_empty (&pTS->RxPendingPktList)) { +while (!list_empty (&pTS->rx_pending_pkt_list)) {IEEE80211_DEBUG (IEEE80211_DL_REORDER ,"%s(): start RREORDER indicate\n" ,__func__); - pReorderEntry = (PRX_REORDER_ENTRY )list_entry (pTS->RxPendingPktList.prev,RX_REORDER_ENTRY ,List); + pReorderEntry = (PRX_REORDER_ENTRY )list_entry (pTS->rx_pending_pkt_list.prev,RX_REORDER_ENTRY ,List);if (SN_LESS (pReorderEntry->SeqNum, pTS->rx_indicate_seq) ||SN_EQUAL (pReorderEntry->SeqNum, pTS->rx_indicate_seq)) {
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +1 -1
@@ -41,7 +41,7 @@ struct rx_ts_record {struct ts_common_info ts_common_info;u16 rx_indicate_seq;u16 rx_timeout_indicate_seq; -struct list_head RxPendingPktList; +struct list_head rx_pending_pkt_list;struct timer_list RxPktPendingTimer;BA_RECORD RxAdmittedBARecord;/* For BA Recipient */ u16 RxLastSeqNum;
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +6 -6
@@ -39,8 +39,8 @@ static void RxPktPendingTimeout(struct timer_list *t)IEEE80211_DEBUG (IEEE80211_DL_REORDER ,"==================>%s()\n" ,__func__);if (pRxTs->rx_timeout_indicate_seq !=0xffff ) {// Indicate the pending packets sequentially according to SeqNum until meet the gap. -while (!list_empty (&pRxTs->RxPendingPktList)) { - pReorderEntry = (PRX_REORDER_ENTRY )list_entry (pRxTs->RxPendingPktList.prev,RX_REORDER_ENTRY ,List); +while (!list_empty (&pRxTs->rx_pending_pkt_list)) { + pReorderEntry = (PRX_REORDER_ENTRY )list_entry (pRxTs->rx_pending_pkt_list.prev,RX_REORDER_ENTRY ,List);if (index ==0 ) pRxTs->rx_indicate_seq = pReorderEntry->SeqNum;
@@ -166,7 +166,7 @@ void TSInitialize(struct ieee80211_device *ieee)INIT_LIST_HEAD (&ieee->Rx_TS_Unused_List);for (count =0 ; count <TOTAL_TS_NUM ; count++) { pRxTS->num = count; -INIT_LIST_HEAD (&pRxTS->RxPendingPktList); +INIT_LIST_HEAD (&pRxTS->rx_pending_pkt_list);timer_setup (&pRxTS->ts_common_info.setup_timer, TsSetupTimeOut,0 ); timer_setup(&pRxTS->ts_common_info.inact_timer, TsInactTimeout,
@@ -423,10 +423,10 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info *if (timer_pending (&pRxTS->RxPktPendingTimer))del_timer_sync (&pRxTS->RxPktPendingTimer); -while (!list_empty (&pRxTS->RxPendingPktList)) { +while (!list_empty (&pRxTS->rx_pending_pkt_list)) {spin_lock_irqsave (&(ieee->reorder_spinlock), flags); -//pRxReorderEntry = list_entry(&pRxTS->RxPendingPktList.prev,RX_REORDER_ENTRY,List); - pRxReorderEntry = (PRX_REORDER_ENTRY )list_entry (pRxTS->RxPendingPktList.prev,RX_REORDER_ENTRY ,List); +//pRxReorderEntry = list_entry(&pRxTS->rx_pending_pkt_list.prev,RX_REORDER_ENTRY,List); + pRxReorderEntry = (PRX_REORDER_ENTRY )list_entry (pRxTS->rx_pending_pkt_list.prev,RX_REORDER_ENTRY ,List);list_del_init (&pRxReorderEntry->List); {int i =0 ;
Signature · 1 line
2.18.0
PATCH 16/20 staging:rtl8192u: Rename RxPktPendingTimer - Style
In reply to John WhitmoreRename the member variable RxPktPendingTimer to rx_pkt_pending_timer. This change clears the checkpatch issue with CamelCase naming.
The resulting changes are coding style changes in nature so should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 10 +++++----- drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 +- drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +5 -5
@@ -740,7 +740,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,/* Handling pending timer. Set this timer to prevent from long time Rx buffering.*/ if (index>0 ) {// Cancel previous pending timer. -// del_timer_sync(&pTS->RxPktPendingTimer); +// del_timer_sync(&pTS->rx_pkt_pending_timer); pTS->rx_timeout_indicate_seq =0xffff ;// Indicate packets
@@ -756,11 +756,11 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,// Set new pending timer. IEEE80211_DEBUG (IEEE80211_DL_REORDER ,"%s(): SET rx timeout timer\n" , __func__); pTS->rx_timeout_indicate_seq = pTS->rx_indicate_seq; -if (timer_pending (&pTS->RxPktPendingTimer)) -del_timer_sync (&pTS->RxPktPendingTimer); - pTS->RxPktPendingTimer.expires = jiffies + +if (timer_pending (&pTS->rx_pkt_pending_timer)) +del_timer_sync (&pTS->rx_pkt_pending_timer); + pTS->rx_pkt_pending_timer.expires = jiffies +msecs_to_jiffies (pHTInfo->RxReorderPendingTime); -add_timer (&pTS->RxPktPendingTimer); +add_timer (&pTS->rx_pkt_pending_timer); }kfree (prxbIndicateArray);
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +1 -1
@@ -42,7 +42,7 @@ struct rx_ts_record {u16 rx_indicate_seq;u16 rx_timeout_indicate_seq;struct list_head rx_pending_pkt_list; -struct timer_list RxPktPendingTimer; +struct timer_list rx_pkt_pending_timer;BA_RECORD RxAdmittedBARecord;/* For BA Recipient */ u16 RxLastSeqNum;u8 RxLastFragNum;
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +5 -5
@@ -25,7 +25,7 @@ static void TsInactTimeout(struct timer_list *unused)********************************************************************************************************************/ static void RxPktPendingTimeout (struct timer_list *t) { -struct rx_ts_record *pRxTs =from_timer (pRxTs, t, RxPktPendingTimer); +struct rx_ts_record *pRxTs =from_timer (pRxTs, t, rx_pkt_pending_timer); struct ieee80211_device *ieee = container_of(pRxTs, struct ieee80211_device, RxTsRecord[pRxTs->num]);PRX_REORDER_ENTRY pReorderEntry =NULL ;
@@ -78,7 +78,7 @@ static void RxPktPendingTimeout(struct timer_list *t)if (bPktInBuf && (pRxTs->rx_timeout_indicate_seq ==0xffff )) { pRxTs->rx_timeout_indicate_seq = pRxTs->rx_indicate_seq; -mod_timer (&pRxTs->RxPktPendingTimer, +mod_timer (&pRxTs->rx_pkt_pending_timer, jiffies +msecs_to_jiffies (ieee->pHTInfo->RxReorderPendingTime)); }spin_unlock_irqrestore (&(ieee->reorder_spinlock), flags);
@@ -173,7 +173,7 @@ void TSInitialize(struct ieee80211_device *ieee) 0);timer_setup (&pRxTS->RxAdmittedBARecord.Timer, RxBaInactTimeout,0 ); -timer_setup (&pRxTS->RxPktPendingTimer, RxPktPendingTimeout,0 ); +timer_setup (&pRxTS->rx_pkt_pending_timer, RxPktPendingTimeout,0 );ResetRxTsEntry (pRxTS);list_add_tail (&pRxTS->ts_common_info.list, &ieee->Rx_TS_Unused_List); pRxTS++;
@@ -420,8 +420,8 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info *//#ifdef TO_DO_LIST PRX_REORDER_ENTRY pRxReorderEntry;struct rx_ts_record *pRxTS = (struct rx_ts_record *)pTs; -if (timer_pending (&pRxTS->RxPktPendingTimer)) -del_timer_sync (&pRxTS->RxPktPendingTimer); +if (timer_pending (&pRxTS->rx_pkt_pending_timer)) +del_timer_sync (&pRxTS->rx_pkt_pending_timer);while (!list_empty (&pRxTS->rx_pending_pkt_list)) {spin_lock_irqsave (&(ieee->reorder_spinlock), flags);
Signature · 1 line
2.18.0
PATCH 17/20 staging:rtl8192u: Rename RxAdmittedBARecord - Style
In reply to John WhitmoreRename the member variable RxAdmittedBARecord to rx_admitted_ba_record. This change clears the checkpatch issue with CamelCase naming.
The resulting changes are coding style in nature and as such should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 10 +++++----- drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 +- drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c +5 -5
@@ -70,7 +70,7 @@ static u8 TxTsDeleteBA(struct ieee80211_device *ieee, struct tx_ts_record *pTxTs********************************************************************************************************************/ static u8 RxTsDeleteBA (struct ieee80211_device *ieee,struct rx_ts_record *pRxTs) { -PBA_RECORD pBa = &pRxTs->RxAdmittedBARecord; +PBA_RECORD pBa = &pRxTs->rx_admitted_ba_record;u8 bSendDELBA = false;if (pBa->bValid) {
@@ -369,7 +369,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)IEEE80211_DEBUG (IEEE80211_DL_ERR ,"can't get TS in %s()\n" , __func__); goto OnADDBAReq_Fail; } - pBA = &pTS->RxAdmittedBARecord; + pBA = &pTS->rx_admitted_ba_record;// To Determine the ADDBA Req content // We can do much more check here, including BufferSize, AMSDU_Support, Policy, StartSeqCtrl... // I want to check StartSeqCtrl to make sure when we start aggregation!!!
@@ -656,7 +656,7 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo,ieee80211_send_DELBA ( ieee, pTsCommonInfo->addr, - &pRxTs->RxAdmittedBARecord, + &pRxTs->rx_admitted_ba_record, TxRxSelect,DELBA_REASON_END_BA ); }
@@ -691,14 +691,14 @@ void TxBaInactTimeout(struct timer_list *t)void RxBaInactTimeout (struct timer_list *t) { -struct rx_ts_record *pRxTs =from_timer (pRxTs, t, RxAdmittedBARecord.Timer); +struct rx_ts_record *pRxTs =from_timer (pRxTs, t, rx_admitted_ba_record.Timer); struct ieee80211_device *ieee = container_of(pRxTs, struct ieee80211_device, RxTsRecord[pRxTs->num]);RxTsDeleteBA (ieee, pRxTs);ieee80211_send_DELBA ( ieee, pRxTs->ts_common_info.addr, - &pRxTs->RxAdmittedBARecord, + &pRxTs->rx_admitted_ba_record,RX_DIR ,DELBA_REASON_TIMEOUT ); }
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +1 -1
@@ -43,7 +43,7 @@ struct rx_ts_record {u16 rx_timeout_indicate_seq;struct list_head rx_pending_pkt_list;struct timer_list rx_pkt_pending_timer; -BA_RECORD RxAdmittedBARecord;/* For BA Recipient */ +BA_RECORD rx_admitted_ba_record;/* For BA Recipient */ u16 RxLastSeqNum;u8 RxLastFragNum;u8 num;
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +2 -2
@@ -126,7 +126,7 @@ static void ResetRxTsEntry(struct rx_ts_record *pTS)ResetTsCommonInfo (&pTS->ts_common_info); pTS->rx_indicate_seq =0xffff ;// This indicate the rx_indicate_seq is not used now!! pTS->rx_timeout_indicate_seq =0xffff ;// This indicate the rx_timeout_indicate_seq is not used now!! -ResetBaEntry (&pTS->RxAdmittedBARecord);// For BA Recipient +ResetBaEntry (&pTS->rx_admitted_ba_record);// For BA Recipient }void TSInitialize (struct ieee80211_device *ieee)
@@ -171,7 +171,7 @@ void TSInitialize(struct ieee80211_device *ieee) 0);timer_setup (&pRxTS->ts_common_info.inact_timer, TsInactTimeout,0 ); -timer_setup (&pRxTS->RxAdmittedBARecord.Timer, +timer_setup (&pRxTS->rx_admitted_ba_record.Timer, RxBaInactTimeout,0 );timer_setup (&pRxTS->rx_pkt_pending_timer, RxPktPendingTimeout,0 );ResetRxTsEntry (pRxTS);
Signature · 1 line
2.18.0
PATCH 18/20 staging:rtl8192u: Rename RxLastSeqNum - Style
In reply to John WhitmoreRename the member variable RxLastSeqNum to rx_last_seq_num. This change clears the checkpatch issue with CamelCase naming.
The resulting changes are purely coding style in nature so should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 6 +++--- drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +3 -3
@@ -1028,16 +1028,16 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, true)) { -// IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): pRxTS->RxLastFragNum is %d,frag is %d,pRxTS->RxLastSeqNum is %d,seq is %d\n",__func__,pRxTS->RxLastFragNum,frag,pRxTS->RxLastSeqNum,WLAN_GET_SEQ_SEQ(sc)); +// IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): pRxTS->RxLastFragNum is %d,frag is %d,pRxTS->rx_last_seq_num is %d,seq is %d\n",__func__,pRxTS->RxLastFragNum,frag,pRxTS->rx_last_seq_num,WLAN_GET_SEQ_SEQ(sc)); if ((fc & (1 <<11 )) && (frag == pRxTS->RxLastFragNum) && - (WLAN_GET_SEQ_SEQ (sc) == pRxTS->RxLastSeqNum)) { + (WLAN_GET_SEQ_SEQ (sc) == pRxTS->rx_last_seq_num)) { goto rx_dropped; }else { pRxTS->RxLastFragNum = frag; - pRxTS->RxLastSeqNum =WLAN_GET_SEQ_SEQ (sc); + pRxTS->rx_last_seq_num =WLAN_GET_SEQ_SEQ (sc); } } else
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +1 -1
@@ -44,7 +44,7 @@ struct rx_ts_record {struct list_head rx_pending_pkt_list;struct timer_list rx_pkt_pending_timer;BA_RECORD rx_admitted_ba_record;/* For BA Recipient */ -u16 RxLastSeqNum; +u16 rx_last_seq_num;u8 RxLastFragNum;u8 num; };
Signature · 1 line
2.18.0
PATCH 19/20 staging:rtl8192u: Rename RxLastFragNum - Style
In reply to John WhitmoreRename the member variable RxLastFragNum to rx_last_frag_num. This change clears the checkpatch issue with CamelCase naming.
The resulting edits are all coding style changes which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 6 +++--- drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +3 -3
@@ -1028,15 +1028,15 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, true)) { -// IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): pRxTS->RxLastFragNum is %d,frag is %d,pRxTS->rx_last_seq_num is %d,seq is %d\n",__func__,pRxTS->RxLastFragNum,frag,pRxTS->rx_last_seq_num,WLAN_GET_SEQ_SEQ(sc)); +// IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): pRxTS->rx_last_frag_num is %d,frag is %d,pRxTS->rx_last_seq_num is %d,seq is %d\n",__func__,pRxTS->rx_last_frag_num,frag,pRxTS->rx_last_seq_num,WLAN_GET_SEQ_SEQ(sc)); if ((fc & (1 <<11 )) && - (frag == pRxTS->RxLastFragNum) && + (frag == pRxTS->rx_last_frag_num) && (WLAN_GET_SEQ_SEQ (sc) == pRxTS->rx_last_seq_num)) { goto rx_dropped; }else { - pRxTS->RxLastFragNum = frag; + pRxTS->rx_last_frag_num = frag; pRxTS->rx_last_seq_num =WLAN_GET_SEQ_SEQ (sc); } }
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +1 -1
@@ -45,7 +45,7 @@ struct rx_ts_record {struct timer_list rx_pkt_pending_timer;BA_RECORD rx_admitted_ba_record;/* For BA Recipient */ u16 rx_last_seq_num; -u8 RxLastFragNum; +u8 rx_last_frag_num;u8 num; };
Signature · 1 line
2.18.0
PATCH 20/20 staging:rtl8192u: Remove blank line - Style
In reply to John WhitmoreRemove a blank line to clear the checkpatch issue with use of multiple blank lines.
This is a coding style change which should have no impact on runtime code execution.
--- drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 1 - 1 file changed, 1 deletion(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +0 -1
@@ -49,5 +49,4 @@ struct rx_ts_record { u8 num; }; -#endif
Signature · 1 line
2.18.0