From b6602fa3cef38f35c8cc4f613a904aed43acc5a6 Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Thu, 3 Dec 2009 09:46:33 +0000 Subject: [PATCH] --- yaml --- r: 172143 b: refs/heads/master c: b929e53cb7796a8abe47174dfdfdf90cbb65a8bf h: refs/heads/master i: 172141: f25873065d0ad6892a89c3f0aa36d693da37f42f 172139: 93b5731b07c56039aafa82dd1fc2848254070368 172135: fd3eae2f206035d6c2fec39a95f1198c3251b663 172127: 7735e4888b696c80b9fcd39e3afa3e590c203627 v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a98a43538204..0cef4b28c6c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20175c57f23cde2049c509eb00a2f9d373478107 +refs/heads/master: b929e53cb7796a8abe47174dfdfdf90cbb65a8bf diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c index 665253a3e73a..dba3840d7df9 100644 --- a/trunk/drivers/net/bnx2.c +++ b/trunk/drivers/net/bnx2.c @@ -5158,8 +5158,12 @@ 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); } @@ -5167,8 +5171,12 @@ bnx2_init_rx_ring(struct bnx2 *bp, int ring_num) 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); }