Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 175139
b: refs/heads/master
c: 7f59b1b
h: refs/heads/master
i:
  175137: 1fc6ffa
  175135: 093774e
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent 3330032 commit 159fc4a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4fbdf811bca06f2ebb374ebc763aea6c2b83f14e
refs/heads/master: 7f59b1bfa3149c81b332a8c2c3935111d97a5b20
19 changes: 1 addition & 18 deletions trunk/drivers/staging/et131x/et1310_rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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++;
}

Expand Down

0 comments on commit 159fc4a

Please sign in to comment.