p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

staging:rtl8192u: Rename RxPktPendingTimer - Style 

Rename 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.

Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
John Whitmore 2018-07-27 18:31:19 +01:00 committed by Greg Kroah-Hartman
parent a1ac7d1c47
commit 5b76f8cbe2
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
View File

@ -740,7 +740,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
/* Handling pending timer. Set this timer to prevent from long time Rx buffering.*/ /* Handling pending timer. Set this timer to prevent from long time Rx buffering.*/
if (index>0) { if (index>0) {
// Cancel previous pending timer. // Cancel previous pending timer.
// del_timer_sync(&pTS->RxPktPendingTimer); // del_timer_sync(&pTS->rx_pkt_pending_timer);
pTS->rx_timeout_indicate_seq = 0xffff; pTS->rx_timeout_indicate_seq = 0xffff;
// Indicate packets // Indicate packets
@ -756,11 +756,11 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
// 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->rx_timeout_indicate_seq = pTS->rx_indicate_seq; pTS->rx_timeout_indicate_seq = pTS->rx_indicate_seq;
if(timer_pending(&pTS->RxPktPendingTimer)) if(timer_pending(&pTS->rx_pkt_pending_timer))
del_timer_sync(&pTS->RxPktPendingTimer); del_timer_sync(&pTS->rx_pkt_pending_timer);
pTS->RxPktPendingTimer.expires = jiffies + pTS->rx_pkt_pending_timer.expires = jiffies +
msecs_to_jiffies(pHTInfo->RxReorderPendingTime); msecs_to_jiffies(pHTInfo->RxReorderPendingTime);
add_timer(&pTS->RxPktPendingTimer); add_timer(&pTS->rx_pkt_pending_timer);
} }
kfree(prxbIndicateArray); kfree(prxbIndicateArray);

2
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
View File

@ -42,7 +42,7 @@ struct rx_ts_record {
u16 rx_indicate_seq; u16 rx_indicate_seq;
u16 rx_timeout_indicate_seq; u16 rx_timeout_indicate_seq;
struct list_head rx_pending_pkt_list; struct list_head rx_pending_pkt_list;
struct timer_list RxPktPendingTimer; struct timer_list rx_pkt_pending_timer;
BA_RECORD RxAdmittedBARecord; /* For BA Recipient */ BA_RECORD RxAdmittedBARecord; /* For BA Recipient */
u16 RxLastSeqNum; u16 RxLastSeqNum;
u8 RxLastFragNum; u8 RxLastFragNum;

10
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
View File

@ -25,7 +25,7 @@ static void TsInactTimeout(struct timer_list *unused)
********************************************************************************************************************/ ********************************************************************************************************************/
static void RxPktPendingTimeout(struct timer_list *t) 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]); struct ieee80211_device *ieee = container_of(pRxTs, struct ieee80211_device, RxTsRecord[pRxTs->num]);
PRX_REORDER_ENTRY pReorderEntry = NULL; PRX_REORDER_ENTRY pReorderEntry = NULL;
@ -78,7 +78,7 @@ static void RxPktPendingTimeout(struct timer_list *t)
if(bPktInBuf && (pRxTs->rx_timeout_indicate_seq == 0xffff)) { if(bPktInBuf && (pRxTs->rx_timeout_indicate_seq == 0xffff)) {
pRxTs->rx_timeout_indicate_seq = pRxTs->rx_indicate_seq; 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)); jiffies + msecs_to_jiffies(ieee->pHTInfo->RxReorderPendingTime));
} }
spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags); spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags);
@ -173,7 +173,7 @@ void TSInitialize(struct ieee80211_device *ieee)
0); 0);
timer_setup(&pRxTS->RxAdmittedBARecord.Timer, timer_setup(&pRxTS->RxAdmittedBARecord.Timer,
RxBaInactTimeout, 0); RxBaInactTimeout, 0);
timer_setup(&pRxTS->RxPktPendingTimer, RxPktPendingTimeout, 0); timer_setup(&pRxTS->rx_pkt_pending_timer, RxPktPendingTimeout, 0);
ResetRxTsEntry(pRxTS); ResetRxTsEntry(pRxTS);
list_add_tail(&pRxTS->ts_common_info.list, &ieee->Rx_TS_Unused_List); list_add_tail(&pRxTS->ts_common_info.list, &ieee->Rx_TS_Unused_List);
pRxTS++; pRxTS++;
@ -420,8 +420,8 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info *
//#ifdef TO_DO_LIST //#ifdef TO_DO_LIST
PRX_REORDER_ENTRY pRxReorderEntry; PRX_REORDER_ENTRY pRxReorderEntry;
struct rx_ts_record *pRxTS = (struct rx_ts_record *)pTs; struct rx_ts_record *pRxTS = (struct rx_ts_record *)pTs;
if(timer_pending(&pRxTS->RxPktPendingTimer)) if(timer_pending(&pRxTS->rx_pkt_pending_timer))
del_timer_sync(&pRxTS->RxPktPendingTimer); del_timer_sync(&pRxTS->rx_pkt_pending_timer);
while(!list_empty(&pRxTS->rx_pending_pkt_list)) { while(!list_empty(&pRxTS->rx_pending_pkt_list)) {
spin_lock_irqsave(&(ieee->reorder_spinlock), flags); spin_lock_irqsave(&(ieee->reorder_spinlock), flags);