diff options
| author | Alan Cox <alan@linux.intel.com> | 2009-10-06 15:50:12 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 12:23:07 -0800 |
| commit | 5720f17502cefac0c80d5ce64bf4e345e957b0fc (patch) | |
| tree | c02ad28bf766ebe76fa9046e79c35e262e395080 /drivers/staging | |
| parent | ceef1a5e0ebc3418c8dbd8644195cce3bcb6949f (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')
| -rw-r--r-- | drivers/staging/et131x/et1310_rx.c | 22 | ||||
| -rw-r--r-- | drivers/staging/et131x/et1310_rx.h | 1 |
2 files changed, 0 insertions, 23 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) * lists now. */ INIT_LIST_HEAD(&rx_ring->RecvList); - INIT_LIST_HEAD(&rx_ring->RecvPendingList); return 0; } @@ -421,14 +420,6 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter) kmem_cache_free(adapter->RxRing.RecvLookaside, rfd); } - while (!list_empty(&rx_ring->RecvPendingList)) { - rfd = (MP_RFD *) list_entry(rx_ring->RecvPendingList.next, - MP_RFD, list_node); - list_del(&rfd->list_node); - rfd->Packet = NULL; - kmem_cache_free(adapter->RxRing.RecvLookaside, rfd); - } - /* Free Free Buffer Ring 1 */ if (rx_ring->pFbr1RingVa) { /* First the packet memory */ @@ -1021,21 +1012,8 @@ PMP_RFD nic_rx_pkts(struct et131x_adapter *etdev) */ void et131x_reset_recv(struct et131x_adapter *etdev) { - PMP_RFD rfd; - struct list_head *element; - WARN_ON(list_empty(&etdev->RxRing.RecvList)); - /* Take all the RFD's from the pending list, and stick them on the - * RecvList. - */ - while (!list_empty(&etdev->RxRing.RecvPendingList)) { - element = etdev->RxRing.RecvPendingList.next; - - rfd = (PMP_RFD) list_entry(element, MP_RFD, list_node); - - list_move_tail(&rfd->list_node, &etdev->RxRing.RecvList); - } } /** diff --git a/drivers/staging/et131x/et1310_rx.h b/drivers/staging/et131x/et1310_rx.h index 03e859b4311..b71c43205a7 100644 --- a/drivers/staging/et131x/et1310_rx.h +++ b/drivers/staging/et131x/et1310_rx.h @@ -319,7 +319,6 @@ typedef struct _rx_ring_t { /* RECV */ struct list_head RecvList; - struct list_head RecvPendingList; u32 nReadyRecv; u32 NumRfd; |