Commit d36d3096 authored by William Durand's avatar William Durand Committed by Greg Kroah-Hartman

staging: rtl8192e: rename RxPktPendingTimer to rx_pkt_pending_timer in rx_ts_record struct

Rename RxPktPendingTimer to rx_pkt_pending_timer to silence a checkpatch
warning about CamelCase.
Signed-off-by: default avatarWilliam Durand <will+git@drnd.me>
Link: https://lore.kernel.org/r/20210301215335.767-6-will+git@drnd.meSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bd1b2779
...@@ -46,7 +46,7 @@ struct rx_ts_record { ...@@ -46,7 +46,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;
struct ba_record RxAdmittedBARecord; struct ba_record RxAdmittedBARecord;
u16 RxLastSeqNum; u16 RxLastSeqNum;
u8 RxLastFragNum; u8 RxLastFragNum;
......
...@@ -19,7 +19,7 @@ static void TsInactTimeout(struct timer_list *unused) ...@@ -19,7 +19,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, struct rx_ts_record *pRxTs = from_timer(pRxTs, t,
RxPktPendingTimer); rx_pkt_pending_timer);
struct rtllib_device *ieee = container_of(pRxTs, struct rtllib_device, struct rtllib_device *ieee = container_of(pRxTs, struct rtllib_device,
RxTsRecord[pRxTs->num]); RxTsRecord[pRxTs->num]);
...@@ -82,7 +82,7 @@ static void RxPktPendingTimeout(struct timer_list *t) ...@@ -82,7 +82,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, jiffies + mod_timer(&pRxTs->rx_pkt_pending_timer, jiffies +
msecs_to_jiffies(ieee->pHTInfo->RxReorderPendingTime) msecs_to_jiffies(ieee->pHTInfo->RxReorderPendingTime)
); );
} }
...@@ -178,7 +178,7 @@ void TSInitialize(struct rtllib_device *ieee) ...@@ -178,7 +178,7 @@ void TSInitialize(struct rtllib_device *ieee)
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, list_add_tail(&pRxTS->ts_common_info.List,
...@@ -405,8 +405,8 @@ static void RemoveTsEntry(struct rtllib_device *ieee, ...@@ -405,8 +405,8 @@ static void RemoveTsEntry(struct rtllib_device *ieee,
struct rx_reorder_entry *pRxReorderEntry; struct rx_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)) {
pRxReorderEntry = (struct rx_reorder_entry *) pRxReorderEntry = (struct rx_reorder_entry *)
......
...@@ -536,7 +536,7 @@ void rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee, ...@@ -536,7 +536,7 @@ void rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee,
struct rx_reorder_entry *pRxReorderEntry; struct rx_reorder_entry *pRxReorderEntry;
u8 RfdCnt = 0; u8 RfdCnt = 0;
del_timer_sync(&pTS->RxPktPendingTimer); del_timer_sync(&pTS->rx_pkt_pending_timer);
while (!list_empty(&pTS->rx_pending_pkt_list)) { while (!list_empty(&pTS->rx_pending_pkt_list)) {
if (RfdCnt >= REORDER_WIN_SIZE) { if (RfdCnt >= REORDER_WIN_SIZE) {
netdev_info(ieee->dev, netdev_info(ieee->dev,
...@@ -735,8 +735,8 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, ...@@ -735,8 +735,8 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,
* Rx buffering. * Rx buffering.
*/ */
if (index > 0) { if (index > 0) {
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->rx_timeout_indicate_seq = 0xffff; pTS->rx_timeout_indicate_seq = 0xffff;
if (index > REORDER_WIN_SIZE) { if (index > REORDER_WIN_SIZE) {
...@@ -754,7 +754,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, ...@@ -754,7 +754,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,
if (bPktInBuf && pTS->rx_timeout_indicate_seq == 0xffff) { if (bPktInBuf && pTS->rx_timeout_indicate_seq == 0xffff) {
netdev_dbg(ieee->dev, "%s(): SET rx timeout timer\n", __func__); netdev_dbg(ieee->dev, "%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;
mod_timer(&pTS->RxPktPendingTimer, jiffies + mod_timer(&pTS->rx_pkt_pending_timer, jiffies +
msecs_to_jiffies(pHTInfo->RxReorderPendingTime)); msecs_to_jiffies(pHTInfo->RxReorderPendingTime));
} }
spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags); spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags);
......
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