Skip to content

Commit

Permalink
Staging: rtl8192e: rename linked list reference: List
Browse files Browse the repository at this point in the history 
Rename variable List to list, to fix Avoid CamelCase checkpatch warning.

Signed-off-by: Tree Davies <tdavies@darkphysics.net>
Link: https://lore.kernel.org/r/20231216202038.10777-1-tdavies@darkphysics.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
@treedavies @gregkh
treedavies authored and gregkh committed Dec 18, 2023
1 parent 9366378 commit a99ead4
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 56 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/rtl8192e/rtl819x_TS.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ enum tr_select {
};

struct ts_common_info {
struct list_head List;
struct list_head list;
u8 addr[ETH_ALEN];
struct qos_tsinfo tspec;
};
Expand Down
78 changes: 39 additions & 39 deletions drivers/staging/rtl8192e/rtl819x_TSProc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ static void RxPktPendingTimeout(struct timer_list *t)
while (!list_empty(&ts->rx_pending_pkt_list)) {
pReorderEntry = (struct rx_reorder_entry *)
list_entry(ts->rx_pending_pkt_list.prev,
struct rx_reorder_entry, List);
struct rx_reorder_entry, list);
if (index == 0)
ts->rx_indicate_seq = pReorderEntry->SeqNum;

if (SN_LESS(pReorderEntry->SeqNum,
ts->rx_indicate_seq) ||
SN_EQUAL(pReorderEntry->SeqNum,
ts->rx_indicate_seq)) {
list_del_init(&pReorderEntry->List);
list_del_init(&pReorderEntry->list);

if (SN_EQUAL(pReorderEntry->SeqNum,
ts->rx_indicate_seq))
Expand All @@ -47,7 +47,7 @@ static void RxPktPendingTimeout(struct timer_list *t)
pReorderEntry->prxb;
index++;

list_add_tail(&pReorderEntry->List,
list_add_tail(&pReorderEntry->list,
&ieee->RxReorder_Unused_List);
} else {
bPktInBuf = true;
Expand Down Expand Up @@ -138,7 +138,7 @@ void rtllib_ts_init(struct rtllib_device *ieee)
rtllib_tx_ba_inact_timeout, 0);

ResetTxTsEntry(pTxTS);
list_add_tail(&pTxTS->ts_common_info.List,
list_add_tail(&pTxTS->ts_common_info.list,
&ieee->Tx_TS_Unused_List);
pTxTS++;
}
Expand All @@ -155,13 +155,13 @@ void rtllib_ts_init(struct rtllib_device *ieee)
timer_setup(&rxts->rx_pkt_pending_timer, RxPktPendingTimeout, 0);

ResetRxTsEntry(rxts);
list_add_tail(&rxts->ts_common_info.List,
list_add_tail(&rxts->ts_common_info.list,
&ieee->Rx_TS_Unused_List);
rxts++;
}
INIT_LIST_HEAD(&ieee->RxReorder_Unused_List);
for (count = 0; count < REORDER_ENTRY_NUM; count++) {
list_add_tail(&pRxReorderEntry->List,
list_add_tail(&pRxReorderEntry->list,
&ieee->RxReorder_Unused_List);
if (count == (REORDER_ENTRY_NUM - 1))
break;
Expand Down Expand Up @@ -196,17 +196,17 @@ static struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ieee,
for (dir = 0; dir <= DIR_BI_DIR; dir++) {
if (!search_dir[dir])
continue;
list_for_each_entry(pRet, psearch_list, List) {
list_for_each_entry(pRet, psearch_list, list) {
if (memcmp(pRet->addr, addr, 6) == 0 &&
pRet->tspec.ucTSID == TID &&
pRet->tspec.ucDirection == dir)
break;
}
if (&pRet->List != psearch_list)
if (&pRet->list != psearch_list)
break;
}

if (pRet && &pRet->List != psearch_list)
if (pRet && &pRet->list != psearch_list)
return pRet;
return NULL;
}
Expand Down Expand Up @@ -286,8 +286,8 @@ bool rtllib_get_ts(struct rtllib_device *ieee, struct ts_common_info **ppTS,

if (!list_empty(pUnusedList)) {
(*ppTS) = list_entry(pUnusedList->next,
struct ts_common_info, List);
list_del_init(&(*ppTS)->List);
struct ts_common_info, list);
list_del_init(&(*ppTS)->list);
if (TxRxSelect == TX_DIR) {
struct tx_ts_record *tmp =
container_of(*ppTS,
Expand All @@ -309,7 +309,7 @@ bool rtllib_get_ts(struct rtllib_device *ieee, struct ts_common_info **ppTS,
ts_info->ucDirection = Dir;

MakeTSEntry(*ppTS, addr, &tspec);
list_add_tail(&((*ppTS)->List), pAddmitList);
list_add_tail(&((*ppTS)->list), pAddmitList);

return true;
}
Expand All @@ -335,10 +335,10 @@ static void RemoveTsEntry(struct rtllib_device *ieee,
while (!list_empty(&ts->rx_pending_pkt_list)) {
pRxReorderEntry = (struct rx_reorder_entry *)
list_entry(ts->rx_pending_pkt_list.prev,
struct rx_reorder_entry, List);
struct rx_reorder_entry, list);
netdev_dbg(ieee->dev, "%s(): Delete SeqNum %d!\n",
__func__, pRxReorderEntry->SeqNum);
list_del_init(&pRxReorderEntry->List);
list_del_init(&pRxReorderEntry->list);
{
int i = 0;
struct rtllib_rxb *prxb = pRxReorderEntry->prxb;
Expand All @@ -350,7 +350,7 @@ static void RemoveTsEntry(struct rtllib_device *ieee,
kfree(prxb);
prxb = NULL;
}
list_add_tail(&pRxReorderEntry->List,
list_add_tail(&pRxReorderEntry->list,
&ieee->RxReorder_Unused_List);
}
} else {
Expand All @@ -366,37 +366,37 @@ void RemovePeerTS(struct rtllib_device *ieee, u8 *addr)

netdev_info(ieee->dev, "===========>%s, %pM\n", __func__, addr);

list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Pending_List, List) {
list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Pending_List, list) {
if (memcmp(ts->addr, addr, 6) == 0) {
RemoveTsEntry(ieee, ts, TX_DIR);
list_del_init(&ts->List);
list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List);
list_del_init(&ts->list);
list_add_tail(&ts->list, &ieee->Tx_TS_Unused_List);
}
}

list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Admit_List, List) {
list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Admit_List, list) {
if (memcmp(ts->addr, addr, 6) == 0) {
netdev_info(ieee->dev,
"====>remove Tx_TS_admin_list\n");
RemoveTsEntry(ieee, ts, TX_DIR);
list_del_init(&ts->List);
list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List);
list_del_init(&ts->list);
list_add_tail(&ts->list, &ieee->Tx_TS_Unused_List);
}
}

list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Pending_List, List) {
list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Pending_List, list) {
if (memcmp(ts->addr, addr, 6) == 0) {
RemoveTsEntry(ieee, ts, RX_DIR);
list_del_init(&ts->List);
list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List);
list_del_init(&ts->list);
list_add_tail(&ts->list, &ieee->Rx_TS_Unused_List);
}
}

list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Admit_List, List) {
list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Admit_List, list) {
if (memcmp(ts->addr, addr, 6) == 0) {
RemoveTsEntry(ieee, ts, RX_DIR);
list_del_init(&ts->List);
list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List);
list_del_init(&ts->list);
list_add_tail(&ts->list, &ieee->Rx_TS_Unused_List);
}
}
}
Expand All @@ -406,28 +406,28 @@ void RemoveAllTS(struct rtllib_device *ieee)
{
struct ts_common_info *ts, *pTmpTS;

list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Pending_List, List) {
list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Pending_List, list) {
RemoveTsEntry(ieee, ts, TX_DIR);
list_del_init(&ts->List);
list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List);
list_del_init(&ts->list);
list_add_tail(&ts->list, &ieee->Tx_TS_Unused_List);
}

list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Admit_List, List) {
list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Admit_List, list) {
RemoveTsEntry(ieee, ts, TX_DIR);
list_del_init(&ts->List);
list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List);
list_del_init(&ts->list);
list_add_tail(&ts->list, &ieee->Tx_TS_Unused_List);
}

list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Pending_List, List) {
list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Pending_List, list) {
RemoveTsEntry(ieee, ts, RX_DIR);
list_del_init(&ts->List);
list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List);
list_del_init(&ts->list);
list_add_tail(&ts->list, &ieee->Rx_TS_Unused_List);
}

list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Admit_List, List) {
list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Admit_List, list) {
RemoveTsEntry(ieee, ts, RX_DIR);
list_del_init(&ts->List);
list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List);
list_del_init(&ts->list);
list_add_tail(&ts->list, &ieee->Rx_TS_Unused_List);
}
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/rtl8192e/rtllib.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1042,7 +1042,7 @@ struct bandwidth_autoswitch {
#define REORDER_WIN_SIZE 128
#define REORDER_ENTRY_NUM 128
struct rx_reorder_entry {
struct list_head List;
struct list_head list;
u16 SeqNum;
struct rtllib_rxb *prxb;
};
Expand Down
30 changes: 15 additions & 15 deletions drivers/staging/rtl8192e/rtllib_rx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,19 +411,19 @@ static bool AddReorderEntry(struct rx_ts_record *ts,
while (pList->next != &ts->rx_pending_pkt_list) {
if (SN_LESS(pReorderEntry->SeqNum, ((struct rx_reorder_entry *)
list_entry(pList->next, struct rx_reorder_entry,
List))->SeqNum))
list))->SeqNum))
pList = pList->next;
else if (SN_EQUAL(pReorderEntry->SeqNum,
((struct rx_reorder_entry *)list_entry(pList->next,
struct rx_reorder_entry, List))->SeqNum))
struct rx_reorder_entry, list))->SeqNum))
return false;
else
break;
}
pReorderEntry->List.next = pList->next;
pReorderEntry->List.next->prev = &pReorderEntry->List;
pReorderEntry->List.prev = pList;
pList->next = &pReorderEntry->List;
pReorderEntry->list.next = pList->next;
pReorderEntry->list.next->prev = &pReorderEntry->list;
pReorderEntry->list.prev = pList;
pList->next = &pReorderEntry->list;

return true;
}
Expand Down Expand Up @@ -504,15 +504,15 @@ void rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee,

pRxReorderEntry = (struct rx_reorder_entry *)
list_entry(ts->rx_pending_pkt_list.prev,
struct rx_reorder_entry, List);
struct rx_reorder_entry, list);
netdev_dbg(ieee->dev, "%s(): Indicate SeqNum %d!\n", __func__,
pRxReorderEntry->SeqNum);
list_del_init(&pRxReorderEntry->List);
list_del_init(&pRxReorderEntry->list);

ieee->RfdArray[RfdCnt] = pRxReorderEntry->prxb;

RfdCnt = RfdCnt + 1;
list_add_tail(&pRxReorderEntry->List,
list_add_tail(&pRxReorderEntry->list,
&ieee->RxReorder_Unused_List);
}
rtllib_indicate_packets(ieee, ieee->RfdArray, RfdCnt);
Expand Down Expand Up @@ -601,8 +601,8 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,
if (!list_empty(&ieee->RxReorder_Unused_List)) {
pReorderEntry = (struct rx_reorder_entry *)
list_entry(ieee->RxReorder_Unused_List.next,
struct rx_reorder_entry, List);
list_del_init(&pReorderEntry->List);
struct rx_reorder_entry, list);
list_del_init(&pReorderEntry->list);

/* Make a reorder entry and insert
* into a the packet list.
Expand All @@ -617,7 +617,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,
"%s(): Duplicate packet is dropped. IndicateSeq: %d, NewSeq: %d\n",
__func__, ts->rx_indicate_seq,
SeqNum);
list_add_tail(&pReorderEntry->List,
list_add_tail(&pReorderEntry->list,
&ieee->RxReorder_Unused_List);

for (i = 0; i < prxb->nr_subframes; i++)
Expand Down Expand Up @@ -657,7 +657,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,
pReorderEntry = (struct rx_reorder_entry *)
list_entry(ts->rx_pending_pkt_list.prev,
struct rx_reorder_entry,
List);
list);
if (SN_LESS(pReorderEntry->SeqNum, ts->rx_indicate_seq) ||
SN_EQUAL(pReorderEntry->SeqNum, ts->rx_indicate_seq)) {
/* This protect struct buffer from overflow. */
Expand All @@ -669,7 +669,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,
break;
}

list_del_init(&pReorderEntry->List);
list_del_init(&pReorderEntry->list);

if (SN_EQUAL(pReorderEntry->SeqNum, ts->rx_indicate_seq))
ts->rx_indicate_seq = (ts->rx_indicate_seq + 1) %
Expand All @@ -680,7 +680,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,
__func__, pReorderEntry->SeqNum);
index++;

list_add_tail(&pReorderEntry->List,
list_add_tail(&pReorderEntry->list,
&ieee->RxReorder_Unused_List);
} else {
bPktInBuf = true;
Expand Down

0 comments on commit a99ead4

Please sign in to comment.