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

staging: rtl8192e: rename RxTimeoutIndicateSeq to rx_timeout_indicate_seq in rx_ts_record struct

Rename RxTimeoutIndicateSeq to rx_timeout_indicate_seq 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-4-will+git@drnd.meSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b9788755
...@@ -44,7 +44,7 @@ struct tx_ts_record { ...@@ -44,7 +44,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;
struct ba_record RxAdmittedBARecord; struct ba_record RxAdmittedBARecord;
......
...@@ -30,7 +30,7 @@ static void RxPktPendingTimeout(struct timer_list *t) ...@@ -30,7 +30,7 @@ static void RxPktPendingTimeout(struct timer_list *t)
bool bPktInBuf = false; bool bPktInBuf = false;
spin_lock_irqsave(&(ieee->reorder_spinlock), flags); spin_lock_irqsave(&(ieee->reorder_spinlock), flags);
if (pRxTs->RxTimeoutIndicateSeq != 0xffff) { if (pRxTs->rx_timeout_indicate_seq != 0xffff) {
while (!list_empty(&pRxTs->RxPendingPktList)) { while (!list_empty(&pRxTs->RxPendingPktList)) {
pReorderEntry = (struct rx_reorder_entry *) pReorderEntry = (struct rx_reorder_entry *)
list_entry(pRxTs->RxPendingPktList.prev, list_entry(pRxTs->RxPendingPktList.prev,
...@@ -66,7 +66,7 @@ static void RxPktPendingTimeout(struct timer_list *t) ...@@ -66,7 +66,7 @@ static void RxPktPendingTimeout(struct timer_list *t)
} }
if (index > 0) { if (index > 0) {
pRxTs->RxTimeoutIndicateSeq = 0xffff; pRxTs->rx_timeout_indicate_seq = 0xffff;
if (index > REORDER_WIN_SIZE) { if (index > REORDER_WIN_SIZE) {
netdev_warn(ieee->dev, netdev_warn(ieee->dev,
...@@ -80,8 +80,8 @@ static void RxPktPendingTimeout(struct timer_list *t) ...@@ -80,8 +80,8 @@ static void RxPktPendingTimeout(struct timer_list *t)
bPktInBuf = false; bPktInBuf = false;
} }
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, jiffies + mod_timer(&pRxTs->RxPktPendingTimer, jiffies +
msecs_to_jiffies(ieee->pHTInfo->RxReorderPendingTime) 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; pTS->rx_indicate_seq = 0xffff;
pTS->RxTimeoutIndicateSeq = 0xffff; pTS->rx_timeout_indicate_seq = 0xffff;
ResetBaEntry(&pTS->RxAdmittedBARecord); ResetBaEntry(&pTS->RxAdmittedBARecord);
} }
......
...@@ -737,7 +737,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, ...@@ -737,7 +737,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,
if (index > 0) { if (index > 0) {
if (timer_pending(&pTS->RxPktPendingTimer)) if (timer_pending(&pTS->RxPktPendingTimer))
del_timer_sync(&pTS->RxPktPendingTimer); del_timer_sync(&pTS->RxPktPendingTimer);
pTS->RxTimeoutIndicateSeq = 0xffff; pTS->rx_timeout_indicate_seq = 0xffff;
if (index > REORDER_WIN_SIZE) { if (index > REORDER_WIN_SIZE) {
netdev_err(ieee->dev, netdev_err(ieee->dev,
...@@ -751,9 +751,9 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, ...@@ -751,9 +751,9 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,
bPktInBuf = false; bPktInBuf = false;
} }
if (bPktInBuf && pTS->RxTimeoutIndicateSeq == 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->RxTimeoutIndicateSeq = pTS->rx_indicate_seq; pTS->rx_timeout_indicate_seq = pTS->rx_indicate_seq;
mod_timer(&pTS->RxPktPendingTimer, jiffies + mod_timer(&pTS->RxPktPendingTimer, jiffies +
msecs_to_jiffies(pHTInfo->RxReorderPendingTime)); msecs_to_jiffies(pHTInfo->RxReorderPendingTime));
} }
......
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