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

staging:rtl8192u: Rename RxTimeoutIndicateSeq _Style

Rename 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.
Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dfbb36f7
...@@ -741,7 +741,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, ...@@ -741,7 +741,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
if (index>0) { if (index>0) {
// Cancel previous pending timer. // Cancel previous pending timer.
// del_timer_sync(&pTS->RxPktPendingTimer); // del_timer_sync(&pTS->RxPktPendingTimer);
pTS->RxTimeoutIndicateSeq = 0xffff; pTS->rx_timeout_indicate_seq = 0xffff;
// Indicate packets // Indicate packets
if(index>REORDER_WIN_SIZE){ if(index>REORDER_WIN_SIZE){
...@@ -752,10 +752,10 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, ...@@ -752,10 +752,10 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
ieee80211_indicate_packets(ieee, prxbIndicateArray, index); ieee80211_indicate_packets(ieee, prxbIndicateArray, index);
} }
if (bPktInBuf && pTS->RxTimeoutIndicateSeq==0xffff) { if (bPktInBuf && pTS->rx_timeout_indicate_seq == 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->rx_indicate_seq; pTS->rx_timeout_indicate_seq = 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 +
......
...@@ -40,7 +40,7 @@ struct tx_ts_record { ...@@ -40,7 +40,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 rx_indicate_seq; u16 rx_indicate_seq;
u16 RxTimeoutIndicateSeq; u16 rx_timeout_indicate_seq;
struct list_head RxPendingPktList; struct list_head RxPendingPktList;
struct timer_list RxPktPendingTimer; struct timer_list RxPktPendingTimer;
BA_RECORD RxAdmittedBARecord; /* For BA Recipient */ BA_RECORD RxAdmittedBARecord; /* For BA Recipient */
......
...@@ -37,7 +37,7 @@ static void RxPktPendingTimeout(struct timer_list *t) ...@@ -37,7 +37,7 @@ static void RxPktPendingTimeout(struct timer_list *t)
spin_lock_irqsave(&(ieee->reorder_spinlock), flags); spin_lock_irqsave(&(ieee->reorder_spinlock), flags);
IEEE80211_DEBUG(IEEE80211_DL_REORDER,"==================>%s()\n",__func__); 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. // Indicate the pending packets sequentially according to SeqNum until meet the gap.
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);
...@@ -64,8 +64,8 @@ static void RxPktPendingTimeout(struct timer_list *t) ...@@ -64,8 +64,8 @@ static void RxPktPendingTimeout(struct timer_list *t)
} }
if(index>0) { if(index>0) {
// Set RxTimeoutIndicateSeq to 0xffff to indicate no pending packets in buffer now. // Set rx_timeout_indicate_seq to 0xffff to indicate no pending packets in buffer now.
pRxTs->RxTimeoutIndicateSeq = 0xffff; pRxTs->rx_timeout_indicate_seq = 0xffff;
// Indicate packets // Indicate packets
if(index > REORDER_WIN_SIZE) { if(index > REORDER_WIN_SIZE) {
...@@ -76,8 +76,8 @@ static void RxPktPendingTimeout(struct timer_list *t) ...@@ -76,8 +76,8 @@ static void RxPktPendingTimeout(struct timer_list *t)
ieee80211_indicate_packets(ieee, ieee->stats_IndicateArray, index); ieee80211_indicate_packets(ieee, ieee->stats_IndicateArray, index);
} }
if(bPktInBuf && (pRxTs->RxTimeoutIndicateSeq==0xffff)) { if(bPktInBuf && (pRxTs->rx_timeout_indicate_seq == 0xffff)) {
pRxTs->RxTimeoutIndicateSeq = pRxTs->rx_indicate_seq; pRxTs->rx_timeout_indicate_seq = 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));
} }
...@@ -125,7 +125,7 @@ static void ResetRxTsEntry(struct rx_ts_record *pTS) ...@@ -125,7 +125,7 @@ static void ResetRxTsEntry(struct rx_ts_record *pTS)
{ {
ResetTsCommonInfo(&pTS->ts_common_info); ResetTsCommonInfo(&pTS->ts_common_info);
pTS->rx_indicate_seq = 0xffff; // This indicate the rx_indicate_seq 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->rx_timeout_indicate_seq = 0xffff; // This indicate the rx_timeout_indicate_seq 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