tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Staging: rtl8192e: rename linked list reference: List

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>

authored by

Tree Davies and committed by
Greg Kroah-Hartman a99ead4e 93663789

+56 -56
+1 -1
drivers/staging/rtl8192e/rtl819x_TS.h
··· 17 17 }; 18 18 19 19 struct ts_common_info { 20 - struct list_head List; 20 + struct list_head list; 21 21 u8 addr[ETH_ALEN]; 22 22 struct qos_tsinfo tspec; 23 23 };
+39 -39
drivers/staging/rtl8192e/rtl819x_TSProc.c
··· 25 25 while (!list_empty(&ts->rx_pending_pkt_list)) { 26 26 pReorderEntry = (struct rx_reorder_entry *) 27 27 list_entry(ts->rx_pending_pkt_list.prev, 28 - struct rx_reorder_entry, List); 28 + struct rx_reorder_entry, list); 29 29 if (index == 0) 30 30 ts->rx_indicate_seq = pReorderEntry->SeqNum; 31 31 ··· 33 33 ts->rx_indicate_seq) || 34 34 SN_EQUAL(pReorderEntry->SeqNum, 35 35 ts->rx_indicate_seq)) { 36 - list_del_init(&pReorderEntry->List); 36 + list_del_init(&pReorderEntry->list); 37 37 38 38 if (SN_EQUAL(pReorderEntry->SeqNum, 39 39 ts->rx_indicate_seq)) ··· 47 47 pReorderEntry->prxb; 48 48 index++; 49 49 50 - list_add_tail(&pReorderEntry->List, 50 + list_add_tail(&pReorderEntry->list, 51 51 &ieee->RxReorder_Unused_List); 52 52 } else { 53 53 bPktInBuf = true; ··· 138 138 rtllib_tx_ba_inact_timeout, 0); 139 139 140 140 ResetTxTsEntry(pTxTS); 141 - list_add_tail(&pTxTS->ts_common_info.List, 141 + list_add_tail(&pTxTS->ts_common_info.list, 142 142 &ieee->Tx_TS_Unused_List); 143 143 pTxTS++; 144 144 } ··· 155 155 timer_setup(&rxts->rx_pkt_pending_timer, RxPktPendingTimeout, 0); 156 156 157 157 ResetRxTsEntry(rxts); 158 - list_add_tail(&rxts->ts_common_info.List, 158 + list_add_tail(&rxts->ts_common_info.list, 159 159 &ieee->Rx_TS_Unused_List); 160 160 rxts++; 161 161 } 162 162 INIT_LIST_HEAD(&ieee->RxReorder_Unused_List); 163 163 for (count = 0; count < REORDER_ENTRY_NUM; count++) { 164 - list_add_tail(&pRxReorderEntry->List, 164 + list_add_tail(&pRxReorderEntry->list, 165 165 &ieee->RxReorder_Unused_List); 166 166 if (count == (REORDER_ENTRY_NUM - 1)) 167 167 break; ··· 196 196 for (dir = 0; dir <= DIR_BI_DIR; dir++) { 197 197 if (!search_dir[dir]) 198 198 continue; 199 - list_for_each_entry(pRet, psearch_list, List) { 199 + list_for_each_entry(pRet, psearch_list, list) { 200 200 if (memcmp(pRet->addr, addr, 6) == 0 && 201 201 pRet->tspec.ucTSID == TID && 202 202 pRet->tspec.ucDirection == dir) 203 203 break; 204 204 } 205 - if (&pRet->List != psearch_list) 205 + if (&pRet->list != psearch_list) 206 206 break; 207 207 } 208 208 209 - if (pRet && &pRet->List != psearch_list) 209 + if (pRet && &pRet->list != psearch_list) 210 210 return pRet; 211 211 return NULL; 212 212 } ··· 286 286 287 287 if (!list_empty(pUnusedList)) { 288 288 (*ppTS) = list_entry(pUnusedList->next, 289 - struct ts_common_info, List); 290 - list_del_init(&(*ppTS)->List); 289 + struct ts_common_info, list); 290 + list_del_init(&(*ppTS)->list); 291 291 if (TxRxSelect == TX_DIR) { 292 292 struct tx_ts_record *tmp = 293 293 container_of(*ppTS, ··· 309 309 ts_info->ucDirection = Dir; 310 310 311 311 MakeTSEntry(*ppTS, addr, &tspec); 312 - list_add_tail(&((*ppTS)->List), pAddmitList); 312 + list_add_tail(&((*ppTS)->list), pAddmitList); 313 313 314 314 return true; 315 315 } ··· 335 335 while (!list_empty(&ts->rx_pending_pkt_list)) { 336 336 pRxReorderEntry = (struct rx_reorder_entry *) 337 337 list_entry(ts->rx_pending_pkt_list.prev, 338 - struct rx_reorder_entry, List); 338 + struct rx_reorder_entry, list); 339 339 netdev_dbg(ieee->dev, "%s(): Delete SeqNum %d!\n", 340 340 __func__, pRxReorderEntry->SeqNum); 341 - list_del_init(&pRxReorderEntry->List); 341 + list_del_init(&pRxReorderEntry->list); 342 342 { 343 343 int i = 0; 344 344 struct rtllib_rxb *prxb = pRxReorderEntry->prxb; ··· 350 350 kfree(prxb); 351 351 prxb = NULL; 352 352 } 353 - list_add_tail(&pRxReorderEntry->List, 353 + list_add_tail(&pRxReorderEntry->list, 354 354 &ieee->RxReorder_Unused_List); 355 355 } 356 356 } else { ··· 366 366 367 367 netdev_info(ieee->dev, "===========>%s, %pM\n", __func__, addr); 368 368 369 - list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Pending_List, List) { 369 + list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Pending_List, list) { 370 370 if (memcmp(ts->addr, addr, 6) == 0) { 371 371 RemoveTsEntry(ieee, ts, TX_DIR); 372 - list_del_init(&ts->List); 373 - list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List); 372 + list_del_init(&ts->list); 373 + list_add_tail(&ts->list, &ieee->Tx_TS_Unused_List); 374 374 } 375 375 } 376 376 377 - list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Admit_List, List) { 377 + list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Admit_List, list) { 378 378 if (memcmp(ts->addr, addr, 6) == 0) { 379 379 netdev_info(ieee->dev, 380 380 "====>remove Tx_TS_admin_list\n"); 381 381 RemoveTsEntry(ieee, ts, TX_DIR); 382 - list_del_init(&ts->List); 383 - list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List); 382 + list_del_init(&ts->list); 383 + list_add_tail(&ts->list, &ieee->Tx_TS_Unused_List); 384 384 } 385 385 } 386 386 387 - list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Pending_List, List) { 387 + list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Pending_List, list) { 388 388 if (memcmp(ts->addr, addr, 6) == 0) { 389 389 RemoveTsEntry(ieee, ts, RX_DIR); 390 - list_del_init(&ts->List); 391 - list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List); 390 + list_del_init(&ts->list); 391 + list_add_tail(&ts->list, &ieee->Rx_TS_Unused_List); 392 392 } 393 393 } 394 394 395 - list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Admit_List, List) { 395 + list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Admit_List, list) { 396 396 if (memcmp(ts->addr, addr, 6) == 0) { 397 397 RemoveTsEntry(ieee, ts, RX_DIR); 398 - list_del_init(&ts->List); 399 - list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List); 398 + list_del_init(&ts->list); 399 + list_add_tail(&ts->list, &ieee->Rx_TS_Unused_List); 400 400 } 401 401 } 402 402 } ··· 406 406 { 407 407 struct ts_common_info *ts, *pTmpTS; 408 408 409 - list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Pending_List, List) { 409 + list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Pending_List, list) { 410 410 RemoveTsEntry(ieee, ts, TX_DIR); 411 - list_del_init(&ts->List); 412 - list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List); 411 + list_del_init(&ts->list); 412 + list_add_tail(&ts->list, &ieee->Tx_TS_Unused_List); 413 413 } 414 414 415 - list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Admit_List, List) { 415 + list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Admit_List, list) { 416 416 RemoveTsEntry(ieee, ts, TX_DIR); 417 - list_del_init(&ts->List); 418 - list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List); 417 + list_del_init(&ts->list); 418 + list_add_tail(&ts->list, &ieee->Tx_TS_Unused_List); 419 419 } 420 420 421 - list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Pending_List, List) { 421 + list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Pending_List, list) { 422 422 RemoveTsEntry(ieee, ts, RX_DIR); 423 - list_del_init(&ts->List); 424 - list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List); 423 + list_del_init(&ts->list); 424 + list_add_tail(&ts->list, &ieee->Rx_TS_Unused_List); 425 425 } 426 426 427 - list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Admit_List, List) { 427 + list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Admit_List, list) { 428 428 RemoveTsEntry(ieee, ts, RX_DIR); 429 - list_del_init(&ts->List); 430 - list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List); 429 + list_del_init(&ts->list); 430 + list_add_tail(&ts->list, &ieee->Rx_TS_Unused_List); 431 431 } 432 432 } 433 433
+1 -1
drivers/staging/rtl8192e/rtllib.h
··· 1042 1042 #define REORDER_WIN_SIZE 128 1043 1043 #define REORDER_ENTRY_NUM 128 1044 1044 struct rx_reorder_entry { 1045 - struct list_head List; 1045 + struct list_head list; 1046 1046 u16 SeqNum; 1047 1047 struct rtllib_rxb *prxb; 1048 1048 };
+15 -15
drivers/staging/rtl8192e/rtllib_rx.c
··· 411 411 while (pList->next != &ts->rx_pending_pkt_list) { 412 412 if (SN_LESS(pReorderEntry->SeqNum, ((struct rx_reorder_entry *) 413 413 list_entry(pList->next, struct rx_reorder_entry, 414 - List))->SeqNum)) 414 + list))->SeqNum)) 415 415 pList = pList->next; 416 416 else if (SN_EQUAL(pReorderEntry->SeqNum, 417 417 ((struct rx_reorder_entry *)list_entry(pList->next, 418 - struct rx_reorder_entry, List))->SeqNum)) 418 + struct rx_reorder_entry, list))->SeqNum)) 419 419 return false; 420 420 else 421 421 break; 422 422 } 423 - pReorderEntry->List.next = pList->next; 424 - pReorderEntry->List.next->prev = &pReorderEntry->List; 425 - pReorderEntry->List.prev = pList; 426 - pList->next = &pReorderEntry->List; 423 + pReorderEntry->list.next = pList->next; 424 + pReorderEntry->list.next->prev = &pReorderEntry->list; 425 + pReorderEntry->list.prev = pList; 426 + pList->next = &pReorderEntry->list; 427 427 428 428 return true; 429 429 } ··· 504 504 505 505 pRxReorderEntry = (struct rx_reorder_entry *) 506 506 list_entry(ts->rx_pending_pkt_list.prev, 507 - struct rx_reorder_entry, List); 507 + struct rx_reorder_entry, list); 508 508 netdev_dbg(ieee->dev, "%s(): Indicate SeqNum %d!\n", __func__, 509 509 pRxReorderEntry->SeqNum); 510 - list_del_init(&pRxReorderEntry->List); 510 + list_del_init(&pRxReorderEntry->list); 511 511 512 512 ieee->RfdArray[RfdCnt] = pRxReorderEntry->prxb; 513 513 514 514 RfdCnt = RfdCnt + 1; 515 - list_add_tail(&pRxReorderEntry->List, 515 + list_add_tail(&pRxReorderEntry->list, 516 516 &ieee->RxReorder_Unused_List); 517 517 } 518 518 rtllib_indicate_packets(ieee, ieee->RfdArray, RfdCnt); ··· 601 601 if (!list_empty(&ieee->RxReorder_Unused_List)) { 602 602 pReorderEntry = (struct rx_reorder_entry *) 603 603 list_entry(ieee->RxReorder_Unused_List.next, 604 - struct rx_reorder_entry, List); 605 - list_del_init(&pReorderEntry->List); 604 + struct rx_reorder_entry, list); 605 + list_del_init(&pReorderEntry->list); 606 606 607 607 /* Make a reorder entry and insert 608 608 * into a the packet list. ··· 617 617 "%s(): Duplicate packet is dropped. IndicateSeq: %d, NewSeq: %d\n", 618 618 __func__, ts->rx_indicate_seq, 619 619 SeqNum); 620 - list_add_tail(&pReorderEntry->List, 620 + list_add_tail(&pReorderEntry->list, 621 621 &ieee->RxReorder_Unused_List); 622 622 623 623 for (i = 0; i < prxb->nr_subframes; i++) ··· 657 657 pReorderEntry = (struct rx_reorder_entry *) 658 658 list_entry(ts->rx_pending_pkt_list.prev, 659 659 struct rx_reorder_entry, 660 - List); 660 + list); 661 661 if (SN_LESS(pReorderEntry->SeqNum, ts->rx_indicate_seq) || 662 662 SN_EQUAL(pReorderEntry->SeqNum, ts->rx_indicate_seq)) { 663 663 /* This protect struct buffer from overflow. */ ··· 669 669 break; 670 670 } 671 671 672 - list_del_init(&pReorderEntry->List); 672 + list_del_init(&pReorderEntry->list); 673 673 674 674 if (SN_EQUAL(pReorderEntry->SeqNum, ts->rx_indicate_seq)) 675 675 ts->rx_indicate_seq = (ts->rx_indicate_seq + 1) % ··· 680 680 __func__, pReorderEntry->SeqNum); 681 681 index++; 682 682 683 - list_add_tail(&pReorderEntry->List, 683 + list_add_tail(&pReorderEntry->list, 684 684 &ieee->RxReorder_Unused_List); 685 685 } else { 686 686 bPktInBuf = true;