From 159fc4a7d25d06855ef9725a75dc900e40f91f46 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 6 Oct 2009 15:49:04 +0100 Subject: [PATCH] --- yaml --- r: 175139 b: refs/heads/master c: 7f59b1bfa3149c81b332a8c2c3935111d97a5b20 h: refs/heads/master i: 175137: 1fc6ffa0ea3376b6e348ce5772cbd5ce0fe47fd8 175135: 093774e717a5ad91abfe2b80b33b6c9951f8b6ce v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et1310_rx.c | 19 +------------------ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index b258acf48a34..5ed92330bfd6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fbdf811bca06f2ebb374ebc763aea6c2b83f14e +refs/heads/master: 7f59b1bfa3149c81b332a8c2c3935111d97a5b20 diff --git a/trunk/drivers/staging/et131x/et1310_rx.c b/trunk/drivers/staging/et131x/et1310_rx.c index 5d17abdf7119..f8fee252a944 100644 --- a/trunk/drivers/staging/et131x/et1310_rx.c +++ b/trunk/drivers/staging/et131x/et1310_rx.c @@ -1076,10 +1076,7 @@ void et131x_reset_recv(struct et131x_adapter *etdev) void et131x_handle_recv_interrupt(struct et131x_adapter *etdev) { PMP_RFD rfd = NULL; - struct sk_buff *packets[NUM_PACKETS_HANDLED]; - PMP_RFD freed[NUM_PACKETS_HANDLED]; u32 count = 0; - u32 nfree = 0; bool done = true; /* Process up to available RFD's */ @@ -1110,24 +1107,10 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *etdev) etdev->Stats.ipackets++; /* Set the status on the packet, either resources or success */ - if (etdev->RxRing.nReadyRecv >= RFD_LOW_WATER_MARK) { - /* Put this RFD on the pending list - * - * NOTE: nic_rx_pkts() above is already returning the - * RFD to the RecvList, so don't additionally do that - * here. - * Besides, we don't really need (at this point) the - * pending list anyway. - */ - } else { - freed[nfree] = rfd; - nfree++; - + if (etdev->RxRing.nReadyRecv < RFD_LOW_WATER_MARK) { dev_warn(&etdev->pdev->dev, "RFD's are running out\n"); } - - packets[count] = rfd->Packet; count++; }