aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/et131x/et1310_rx.c
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2009-10-06 10:50:12 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 15:23:07 -0500
commit5720f17502cefac0c80d5ce64bf4e345e957b0fc (patch)
treec02ad28bf766ebe76fa9046e79c35e262e395080 /drivers/staging/et131x/et1310_rx.c
parentceef1a5e0ebc3418c8dbd8644195cce3bcb6949f (diff)
Staging: et131x: Kill the RX pending list
As with tx there was a pending list Linux doesn't use Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et1310_rx.c')
-rw-r--r--drivers/staging/et131x/et1310_rx.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/staging/et131x/et1310_rx.c b/drivers/staging/et131x/et1310_rx.c
index c6097b25f8b..4c4555dffd1 100644
--- a/drivers/staging/et131x/et1310_rx.c
+++ b/drivers/staging/et131x/et1310_rx.c
@@ -390,7 +390,6 @@ int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
390 * lists now. 390 * lists now.
391 */ 391 */
392 INIT_LIST_HEAD(&rx_ring->RecvList); 392 INIT_LIST_HEAD(&rx_ring->RecvList);
393 INIT_LIST_HEAD(&rx_ring->RecvPendingList);
394 return 0; 393 return 0;
395} 394}
396 395
@@ -421,14 +420,6 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
421 kmem_cache_free(adapter->RxRing.RecvLookaside, rfd); 420 kmem_cache_free(adapter->RxRing.RecvLookaside, rfd);
422 } 421 }
423 422
424 while (!list_empty(&rx_ring->RecvPendingList)) {
425 rfd = (MP_RFD *) list_entry(rx_ring->RecvPendingList.next,
426 MP_RFD, list_node);
427 list_del(&rfd->list_node);
428 rfd->Packet = NULL;
429 kmem_cache_free(adapter->RxRing.RecvLookaside, rfd);
430 }
431
432 /* Free Free Buffer Ring 1 */ 423 /* Free Free Buffer Ring 1 */
433 if (rx_ring->pFbr1RingVa) { 424 if (rx_ring->pFbr1RingVa) {
434 /* First the packet memory */ 425 /* First the packet memory */
@@ -1021,21 +1012,8 @@ PMP_RFD nic_rx_pkts(struct et131x_adapter *etdev)
1021 */ 1012 */
1022void et131x_reset_recv(struct et131x_adapter *etdev) 1013void et131x_reset_recv(struct et131x_adapter *etdev)
1023{ 1014{
1024 PMP_RFD rfd;
1025 struct list_head *element;
1026
1027 WARN_ON(list_empty(&etdev->RxRing.RecvList)); 1015 WARN_ON(list_empty(&etdev->RxRing.RecvList));
1028 1016
1029 /* Take all the RFD's from the pending list, and stick them on the
1030 * RecvList.
1031 */
1032 while (!list_empty(&etdev->RxRing.RecvPendingList)) {
1033 element = etdev->RxRing.RecvPendingList.next;
1034
1035 rfd = (PMP_RFD) list_entry(element, MP_RFD, list_node);
1036
1037 list_move_tail(&rfd->list_node, &etdev->RxRing.RecvList);
1038 }
1039} 1017}
1040 1018
1041/** 1019/**