Commit 1ca30a5f authored by Tree Davies's avatar Tree Davies Committed by Greg Kroah-Hartman

Staging: rtl8192e: Rename variable pReorderEntry

Rename variable pReorderEntry to reorder_entry
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: default avatarTree Davies <tdavies@darkphysics.net>
Tested-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/20240908192633.94144-2-tdavies@darkphysics.netSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f95ca858
...@@ -14,7 +14,7 @@ static void RxPktPendingTimeout(struct timer_list *t) ...@@ -14,7 +14,7 @@ static void RxPktPendingTimeout(struct timer_list *t)
struct rtllib_device *ieee = container_of(ts, struct rtllib_device, struct rtllib_device *ieee = container_of(ts, struct rtllib_device,
rx_ts_records[ts->num]); rx_ts_records[ts->num]);
struct rx_reorder_entry *pReorderEntry = NULL; struct rx_reorder_entry *reorder_entry = NULL;
unsigned long flags = 0; unsigned long flags = 0;
u8 index = 0; u8 index = 0;
...@@ -23,31 +23,31 @@ static void RxPktPendingTimeout(struct timer_list *t) ...@@ -23,31 +23,31 @@ static void RxPktPendingTimeout(struct timer_list *t)
spin_lock_irqsave(&(ieee->reorder_spinlock), flags); spin_lock_irqsave(&(ieee->reorder_spinlock), flags);
if (ts->rx_timeout_indicate_seq != 0xffff) { if (ts->rx_timeout_indicate_seq != 0xffff) {
while (!list_empty(&ts->rx_pending_pkt_list)) { while (!list_empty(&ts->rx_pending_pkt_list)) {
pReorderEntry = (struct rx_reorder_entry *) reorder_entry = (struct rx_reorder_entry *)
list_entry(ts->rx_pending_pkt_list.prev, list_entry(ts->rx_pending_pkt_list.prev,
struct rx_reorder_entry, list); struct rx_reorder_entry, list);
if (index == 0) if (index == 0)
ts->rx_indicate_seq = pReorderEntry->SeqNum; ts->rx_indicate_seq = reorder_entry->SeqNum;
if (SN_LESS(pReorderEntry->SeqNum, if (SN_LESS(reorder_entry->SeqNum,
ts->rx_indicate_seq) || ts->rx_indicate_seq) ||
SN_EQUAL(pReorderEntry->SeqNum, SN_EQUAL(reorder_entry->SeqNum,
ts->rx_indicate_seq)) { ts->rx_indicate_seq)) {
list_del_init(&pReorderEntry->list); list_del_init(&reorder_entry->list);
if (SN_EQUAL(pReorderEntry->SeqNum, if (SN_EQUAL(reorder_entry->SeqNum,
ts->rx_indicate_seq)) ts->rx_indicate_seq))
ts->rx_indicate_seq = ts->rx_indicate_seq =
(ts->rx_indicate_seq + 1) % 4096; (ts->rx_indicate_seq + 1) % 4096;
netdev_dbg(ieee->dev, netdev_dbg(ieee->dev,
"%s(): Indicate SeqNum: %d\n", "%s(): Indicate SeqNum: %d\n",
__func__, pReorderEntry->SeqNum); __func__, reorder_entry->SeqNum);
ieee->stats_IndicateArray[index] = ieee->stats_IndicateArray[index] =
pReorderEntry->prxb; reorder_entry->prxb;
index++; index++;
list_add_tail(&pReorderEntry->list, list_add_tail(&reorder_entry->list,
&ieee->RxReorder_Unused_List); &ieee->RxReorder_Unused_List);
} else { } else {
pkt_in_buf = true; pkt_in_buf = true;
......
...@@ -403,26 +403,26 @@ static int is_duplicate_packet(struct rtllib_device *ieee, ...@@ -403,26 +403,26 @@ static int is_duplicate_packet(struct rtllib_device *ieee,
} }
static bool add_reorder_entry(struct rx_ts_record *ts, static bool add_reorder_entry(struct rx_ts_record *ts,
struct rx_reorder_entry *pReorderEntry) struct rx_reorder_entry *reorder_entry)
{ {
struct list_head *list = &ts->rx_pending_pkt_list; struct list_head *list = &ts->rx_pending_pkt_list;
while (list->next != &ts->rx_pending_pkt_list) { while (list->next != &ts->rx_pending_pkt_list) {
if (SN_LESS(pReorderEntry->SeqNum, ((struct rx_reorder_entry *) if (SN_LESS(reorder_entry->SeqNum, ((struct rx_reorder_entry *)
list_entry(list->next, struct rx_reorder_entry, list_entry(list->next, struct rx_reorder_entry,
list))->SeqNum)) list))->SeqNum))
list = list->next; list = list->next;
else if (SN_EQUAL(pReorderEntry->SeqNum, else if (SN_EQUAL(reorder_entry->SeqNum,
((struct rx_reorder_entry *)list_entry(list->next, ((struct rx_reorder_entry *)list_entry(list->next,
struct rx_reorder_entry, list))->SeqNum)) struct rx_reorder_entry, list))->SeqNum))
return false; return false;
else else
break; break;
} }
pReorderEntry->list.next = list->next; reorder_entry->list.next = list->next;
pReorderEntry->list.next->prev = &pReorderEntry->list; reorder_entry->list.next->prev = &reorder_entry->list;
pReorderEntry->list.prev = list; reorder_entry->list.prev = list;
list->next = &pReorderEntry->list; list->next = &reorder_entry->list;
return true; return true;
} }
...@@ -524,7 +524,7 @@ static void rx_reorder_indicate_packet(struct rtllib_device *ieee, ...@@ -524,7 +524,7 @@ static void rx_reorder_indicate_packet(struct rtllib_device *ieee,
struct rx_ts_record *ts, u16 SeqNum) struct rx_ts_record *ts, u16 SeqNum)
{ {
struct rt_hi_throughput *ht_info = ieee->ht_info; struct rt_hi_throughput *ht_info = ieee->ht_info;
struct rx_reorder_entry *pReorderEntry = NULL; struct rx_reorder_entry *reorder_entry = NULL;
u8 win_size = ht_info->rx_reorder_win_size; u8 win_size = ht_info->rx_reorder_win_size;
u16 win_end = 0; u16 win_end = 0;
u8 index = 0; u8 index = 0;
...@@ -598,25 +598,25 @@ static void rx_reorder_indicate_packet(struct rtllib_device *ieee, ...@@ -598,25 +598,25 @@ static void rx_reorder_indicate_packet(struct rtllib_device *ieee,
} else { } else {
/* Current packet is going to be inserted into pending list.*/ /* Current packet is going to be inserted into pending list.*/
if (!list_empty(&ieee->RxReorder_Unused_List)) { if (!list_empty(&ieee->RxReorder_Unused_List)) {
pReorderEntry = (struct rx_reorder_entry *) reorder_entry = (struct rx_reorder_entry *)
list_entry(ieee->RxReorder_Unused_List.next, list_entry(ieee->RxReorder_Unused_List.next,
struct rx_reorder_entry, list); struct rx_reorder_entry, list);
list_del_init(&pReorderEntry->list); list_del_init(&reorder_entry->list);
/* Make a reorder entry and insert /* Make a reorder entry and insert
* into a the packet list. * into a the packet list.
*/ */
pReorderEntry->SeqNum = SeqNum; reorder_entry->SeqNum = SeqNum;
pReorderEntry->prxb = prxb; reorder_entry->prxb = prxb;
if (!add_reorder_entry(ts, pReorderEntry)) { if (!add_reorder_entry(ts, reorder_entry)) {
int i; int i;
netdev_dbg(ieee->dev, netdev_dbg(ieee->dev,
"%s(): Duplicate packet is dropped. IndicateSeq: %d, NewSeq: %d\n", "%s(): Duplicate packet is dropped. IndicateSeq: %d, NewSeq: %d\n",
__func__, ts->rx_indicate_seq, __func__, ts->rx_indicate_seq,
SeqNum); SeqNum);
list_add_tail(&pReorderEntry->list, list_add_tail(&reorder_entry->list,
&ieee->RxReorder_Unused_List); &ieee->RxReorder_Unused_List);
for (i = 0; i < prxb->nr_subframes; i++) for (i = 0; i < prxb->nr_subframes; i++)
...@@ -653,12 +653,12 @@ static void rx_reorder_indicate_packet(struct rtllib_device *ieee, ...@@ -653,12 +653,12 @@ static void rx_reorder_indicate_packet(struct rtllib_device *ieee,
netdev_dbg(ieee->dev, "%s(): start RREORDER indicate\n", netdev_dbg(ieee->dev, "%s(): start RREORDER indicate\n",
__func__); __func__);
pReorderEntry = (struct rx_reorder_entry *) reorder_entry = (struct rx_reorder_entry *)
list_entry(ts->rx_pending_pkt_list.prev, list_entry(ts->rx_pending_pkt_list.prev,
struct rx_reorder_entry, struct rx_reorder_entry,
list); list);
if (SN_LESS(pReorderEntry->SeqNum, ts->rx_indicate_seq) || if (SN_LESS(reorder_entry->SeqNum, ts->rx_indicate_seq) ||
SN_EQUAL(pReorderEntry->SeqNum, ts->rx_indicate_seq)) { SN_EQUAL(reorder_entry->SeqNum, ts->rx_indicate_seq)) {
/* This protect struct buffer from overflow. */ /* This protect struct buffer from overflow. */
if (index >= REORDER_WIN_SIZE) { if (index >= REORDER_WIN_SIZE) {
netdev_err(ieee->dev, netdev_err(ieee->dev,
...@@ -668,18 +668,18 @@ static void rx_reorder_indicate_packet(struct rtllib_device *ieee, ...@@ -668,18 +668,18 @@ static void rx_reorder_indicate_packet(struct rtllib_device *ieee,
break; break;
} }
list_del_init(&pReorderEntry->list); list_del_init(&reorder_entry->list);
if (SN_EQUAL(pReorderEntry->SeqNum, ts->rx_indicate_seq)) if (SN_EQUAL(reorder_entry->SeqNum, ts->rx_indicate_seq))
ts->rx_indicate_seq = (ts->rx_indicate_seq + 1) % ts->rx_indicate_seq = (ts->rx_indicate_seq + 1) %
4096; 4096;
ieee->prxb_indicate_array[index] = pReorderEntry->prxb; ieee->prxb_indicate_array[index] = reorder_entry->prxb;
netdev_dbg(ieee->dev, "%s(): Indicate SeqNum %d!\n", netdev_dbg(ieee->dev, "%s(): Indicate SeqNum %d!\n",
__func__, pReorderEntry->SeqNum); __func__, reorder_entry->SeqNum);
index++; index++;
list_add_tail(&pReorderEntry->list, list_add_tail(&reorder_entry->list,
&ieee->RxReorder_Unused_List); &ieee->RxReorder_Unused_List);
} else { } else {
pkt_in_buf = true; pkt_in_buf = true;
......
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