Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 172143
b: refs/heads/master
c: b929e53
h: refs/heads/master
i:
  172141: f258730
  172139: 93b5731
  172135: fd3eae2
  172127: 7735e48
v: v3
  • Loading branch information
Michael Chan authored and David S. Miller committed Dec 3, 2009
1 parent e1cc8f9 commit b6602fa
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 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: 20175c57f23cde2049c509eb00a2f9d373478107
refs/heads/master: b929e53cb7796a8abe47174dfdfdf90cbb65a8bf
12 changes: 10 additions & 2 deletions trunk/drivers/net/bnx2.c
Original file line number Diff line number Diff line change
Expand Up @@ -5158,17 +5158,25 @@ bnx2_init_rx_ring(struct bnx2 *bp, int ring_num)

ring_prod = prod = rxr->rx_pg_prod;
for (i = 0; i < bp->rx_pg_ring_size; i++) {
if (bnx2_alloc_rx_page(bp, rxr, ring_prod) < 0)
if (bnx2_alloc_rx_page(bp, rxr, ring_prod) < 0) {
printk(KERN_WARNING PFX "%s: init'ed rx page ring %d "
"with %d/%d pages only\n",
bp->dev->name, ring_num, i, bp->rx_pg_ring_size);
break;
}
prod = NEXT_RX_BD(prod);
ring_prod = RX_PG_RING_IDX(prod);
}
rxr->rx_pg_prod = prod;

ring_prod = prod = rxr->rx_prod;
for (i = 0; i < bp->rx_ring_size; i++) {
if (bnx2_alloc_rx_skb(bp, rxr, ring_prod) < 0)
if (bnx2_alloc_rx_skb(bp, rxr, ring_prod) < 0) {
printk(KERN_WARNING PFX "%s: init'ed rx ring %d with "
"%d/%d skbs only\n",
bp->dev->name, ring_num, i, bp->rx_ring_size);
break;
}
prod = NEXT_RX_BD(prod);
ring_prod = RX_RING_IDX(prod);
}
Expand Down

0 comments on commit b6602fa

Please sign in to comment.