From 45e25bc26a3e042e7878c81470b7d1cf500a03e9 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Tue, 6 Oct 2009 15:50:12 +0100
Subject: [PATCH] --- yaml --- r: 175148 b: refs/heads/master c:
 5720f17502cefac0c80d5ce64bf4e345e957b0fc h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/staging/et131x/et1310_rx.c | 22 ----------------------
 trunk/drivers/staging/et131x/et1310_rx.h |  1 -
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 386c0f2f02dc..4c11f77022f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ceef1a5e0ebc3418c8dbd8644195cce3bcb6949f
+refs/heads/master: 5720f17502cefac0c80d5ce64bf4e345e957b0fc
diff --git a/trunk/drivers/staging/et131x/et1310_rx.c b/trunk/drivers/staging/et131x/et1310_rx.c
index c6097b25f8bb..4c4555dffd1f 100644
--- a/trunk/drivers/staging/et131x/et1310_rx.c
+++ b/trunk/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/trunk/drivers/staging/et131x/et1310_rx.h b/trunk/drivers/staging/et131x/et1310_rx.h
index 03e859b43111..b71c43205a7f 100644
--- a/trunk/drivers/staging/et131x/et1310_rx.h
+++ b/trunk/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;