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

staging:rtl8192u: Rename RxIndicateSeq - Style

Rename 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.
Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 596a2ca3
...@@ -592,10 +592,10 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, ...@@ -592,10 +592,10 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
PRX_REORDER_ENTRY pReorderEntry = NULL; PRX_REORDER_ENTRY pReorderEntry = NULL;
struct ieee80211_rxb **prxbIndicateArray; struct ieee80211_rxb **prxbIndicateArray;
u8 WinSize = pHTInfo->RxReorderWinSize; u8 WinSize = pHTInfo->RxReorderWinSize;
u16 WinEnd = (pTS->RxIndicateSeq + WinSize -1)%4096; u16 WinEnd = (pTS->rx_indicate_seq + WinSize - 1) % 4096;
u8 index = 0; u8 index = 0;
bool bMatchWinStart = false, bPktInBuf = false; 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, prxbIndicateArray = kmalloc_array(REORDER_WIN_SIZE,
sizeof(struct ieee80211_rxb *), sizeof(struct ieee80211_rxb *),
...@@ -604,14 +604,14 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, ...@@ -604,14 +604,14 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
return; return;
/* Rx Reorder initialize condition.*/ /* Rx Reorder initialize condition.*/
if (pTS->RxIndicateSeq == 0xffff) { if (pTS->rx_indicate_seq == 0xffff) {
pTS->RxIndicateSeq = SeqNum; pTS->rx_indicate_seq = SeqNum;
} }
/* Drop out the packet which SeqNum is smaller than WinStart */ /* 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", IEEE80211_DEBUG(IEEE80211_DL_REORDER,"Packet Drop! IndicateSeq: %d, NewSeq: %d\n",
pTS->RxIndicateSeq, SeqNum); pTS->rx_indicate_seq, SeqNum);
pHTInfo->RxReorderDropCounter++; pHTInfo->RxReorderDropCounter++;
{ {
int i; int i;
...@@ -631,16 +631,16 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, ...@@ -631,16 +631,16 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
* 1. Incoming SeqNum is equal to WinStart =>Window shift 1 * 1. Incoming SeqNum is equal to WinStart =>Window shift 1
* 2. Incoming SeqNum is larger than the WinEnd => Window shift N * 2. Incoming SeqNum is larger than the WinEnd => Window shift N
*/ */
if(SN_EQUAL(SeqNum, pTS->RxIndicateSeq)) { if(SN_EQUAL(SeqNum, pTS->rx_indicate_seq)) {
pTS->RxIndicateSeq = (pTS->RxIndicateSeq + 1) % 4096; pTS->rx_indicate_seq = (pTS->rx_indicate_seq + 1) % 4096;
bMatchWinStart = true; bMatchWinStart = true;
} else if(SN_LESS(WinEnd, SeqNum)) { } else if(SN_LESS(WinEnd, SeqNum)) {
if(SeqNum >= (WinSize - 1)) { if(SeqNum >= (WinSize - 1)) {
pTS->RxIndicateSeq = SeqNum + 1 -WinSize; pTS->rx_indicate_seq = SeqNum + 1 -WinSize;
} else { } 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, ...@@ -655,7 +655,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
if(bMatchWinStart) { if(bMatchWinStart) {
/* Current packet is going to be indicated.*/ /* Current packet is going to be indicated.*/
IEEE80211_DEBUG(IEEE80211_DL_REORDER, "Packets indication!! IndicateSeq: %d, NewSeq: %d\n",\ IEEE80211_DEBUG(IEEE80211_DL_REORDER, "Packets indication!! IndicateSeq: %d, NewSeq: %d\n",\
pTS->RxIndicateSeq, SeqNum); pTS->rx_indicate_seq, SeqNum);
prxbIndicateArray[0] = prxb; prxbIndicateArray[0] = prxb;
// printk("========================>%s(): SeqNum is %d\n",__func__,SeqNum); // printk("========================>%s(): SeqNum is %d\n",__func__,SeqNum);
index = 1; index = 1;
...@@ -673,7 +673,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, ...@@ -673,7 +673,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
if(!AddReorderEntry(pTS, pReorderEntry)) { if(!AddReorderEntry(pTS, pReorderEntry)) {
IEEE80211_DEBUG(IEEE80211_DL_REORDER, "%s(): Duplicate packet is dropped!! IndicateSeq: %d, NewSeq: %d\n", 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); list_add_tail(&pReorderEntry->List,&ieee->RxReorder_Unused_List);
{ {
int i; int i;
...@@ -685,7 +685,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, ...@@ -685,7 +685,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
} }
} else { } else {
IEEE80211_DEBUG(IEEE80211_DL_REORDER, 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 { else {
...@@ -710,8 +710,8 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, ...@@ -710,8 +710,8 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
while(!list_empty(&pTS->RxPendingPktList)) { while(!list_empty(&pTS->RxPendingPktList)) {
IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): start RREORDER indicate\n",__func__); 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->RxPendingPktList.prev,RX_REORDER_ENTRY,List);
if (SN_LESS(pReorderEntry->SeqNum, pTS->RxIndicateSeq) || if (SN_LESS(pReorderEntry->SeqNum, pTS->rx_indicate_seq) ||
SN_EQUAL(pReorderEntry->SeqNum, pTS->RxIndicateSeq)) SN_EQUAL(pReorderEntry->SeqNum, pTS->rx_indicate_seq))
{ {
/* This protect buffer from overflow. */ /* This protect buffer from overflow. */
if (index >= REORDER_WIN_SIZE) { if (index >= REORDER_WIN_SIZE) {
...@@ -722,10 +722,10 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, ...@@ -722,10 +722,10 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
list_del_init(&pReorderEntry->List); list_del_init(&pReorderEntry->List);
if(SN_EQUAL(pReorderEntry->SeqNum, pTS->RxIndicateSeq)) if(SN_EQUAL(pReorderEntry->SeqNum, pTS->rx_indicate_seq))
pTS->RxIndicateSeq = (pTS->RxIndicateSeq + 1) % 4096; 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; prxbIndicateArray[index] = pReorderEntry->prxb;
// printk("========================>%s(): pReorderEntry->SeqNum is %d\n",__func__,pReorderEntry->SeqNum); // printk("========================>%s(): pReorderEntry->SeqNum is %d\n",__func__,pReorderEntry->SeqNum);
index++; index++;
...@@ -755,7 +755,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, ...@@ -755,7 +755,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
if (bPktInBuf && pTS->RxTimeoutIndicateSeq==0xffff) { if (bPktInBuf && pTS->RxTimeoutIndicateSeq==0xffff) {
// Set new pending timer. // Set new pending timer.
IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): SET rx timeout timer\n", __func__); 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)) if(timer_pending(&pTS->RxPktPendingTimer))
del_timer_sync(&pTS->RxPktPendingTimer); del_timer_sync(&pTS->RxPktPendingTimer);
pTS->RxPktPendingTimer.expires = jiffies + pTS->RxPktPendingTimer.expires = jiffies +
......
...@@ -39,7 +39,7 @@ struct tx_ts_record { ...@@ -39,7 +39,7 @@ struct tx_ts_record {
struct rx_ts_record { struct rx_ts_record {
struct ts_common_info ts_common_info; struct ts_common_info ts_common_info;
u16 RxIndicateSeq; u16 rx_indicate_seq;
u16 RxTimeoutIndicateSeq; u16 RxTimeoutIndicateSeq;
struct list_head RxPendingPktList; struct list_head RxPendingPktList;
struct timer_list RxPktPendingTimer; struct timer_list RxPktPendingTimer;
......
...@@ -42,14 +42,14 @@ static void RxPktPendingTimeout(struct timer_list *t) ...@@ -42,14 +42,14 @@ static void RxPktPendingTimeout(struct timer_list *t)
while(!list_empty(&pRxTs->RxPendingPktList)) { while(!list_empty(&pRxTs->RxPendingPktList)) {
pReorderEntry = (PRX_REORDER_ENTRY)list_entry(pRxTs->RxPendingPktList.prev,RX_REORDER_ENTRY,List); pReorderEntry = (PRX_REORDER_ENTRY)list_entry(pRxTs->RxPendingPktList.prev,RX_REORDER_ENTRY,List);
if(index == 0) if(index == 0)
pRxTs->RxIndicateSeq = pReorderEntry->SeqNum; pRxTs->rx_indicate_seq = pReorderEntry->SeqNum;
if( SN_LESS(pReorderEntry->SeqNum, pRxTs->RxIndicateSeq) || if( SN_LESS(pReorderEntry->SeqNum, pRxTs->rx_indicate_seq) ||
SN_EQUAL(pReorderEntry->SeqNum, pRxTs->RxIndicateSeq) ) { SN_EQUAL(pReorderEntry->SeqNum, pRxTs->rx_indicate_seq) ) {
list_del_init(&pReorderEntry->List); list_del_init(&pReorderEntry->List);
if(SN_EQUAL(pReorderEntry->SeqNum, pRxTs->RxIndicateSeq)) if(SN_EQUAL(pReorderEntry->SeqNum, pRxTs->rx_indicate_seq))
pRxTs->RxIndicateSeq = (pRxTs->RxIndicateSeq + 1) % 4096; pRxTs->rx_indicate_seq = (pRxTs->rx_indicate_seq + 1) % 4096;
IEEE80211_DEBUG(IEEE80211_DL_REORDER,"RxPktPendingTimeout(): IndicateSeq: %d\n", pReorderEntry->SeqNum); IEEE80211_DEBUG(IEEE80211_DL_REORDER,"RxPktPendingTimeout(): IndicateSeq: %d\n", pReorderEntry->SeqNum);
ieee->stats_IndicateArray[index] = pReorderEntry->prxb; ieee->stats_IndicateArray[index] = pReorderEntry->prxb;
...@@ -77,7 +77,7 @@ static void RxPktPendingTimeout(struct timer_list *t) ...@@ -77,7 +77,7 @@ static void RxPktPendingTimeout(struct timer_list *t)
} }
if(bPktInBuf && (pRxTs->RxTimeoutIndicateSeq==0xffff)) { if(bPktInBuf && (pRxTs->RxTimeoutIndicateSeq==0xffff)) {
pRxTs->RxTimeoutIndicateSeq = pRxTs->RxIndicateSeq; pRxTs->RxTimeoutIndicateSeq = pRxTs->rx_indicate_seq;
mod_timer(&pRxTs->RxPktPendingTimer, mod_timer(&pRxTs->RxPktPendingTimer,
jiffies + msecs_to_jiffies(ieee->pHTInfo->RxReorderPendingTime)); jiffies + msecs_to_jiffies(ieee->pHTInfo->RxReorderPendingTime));
} }
...@@ -124,7 +124,7 @@ static void ResetTxTsEntry(struct tx_ts_record *pTS) ...@@ -124,7 +124,7 @@ static void ResetTxTsEntry(struct tx_ts_record *pTS)
static void ResetRxTsEntry(struct rx_ts_record *pTS) static void ResetRxTsEntry(struct rx_ts_record *pTS)
{ {
ResetTsCommonInfo(&pTS->ts_common_info); 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!! pTS->RxTimeoutIndicateSeq = 0xffff; // This indicate the RxTimeoutIndicateSeq is not used now!!
ResetBaEntry(&pTS->RxAdmittedBARecord); // For BA Recipient ResetBaEntry(&pTS->RxAdmittedBARecord); // For BA Recipient
} }
......
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