From 3bae7483b8eb0cd2238f0852e7ea698e09a81a9c Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Mon, 15 Feb 2010 19:42:08 +0000
Subject: [PATCH] --- yaml --- r: 184193 b: refs/heads/master c:
 e9f26c49ce790de0064474f97d6402ce1fefac2a h: refs/heads/master i:   184191:
 755627a9b939b9e5eb59202a32b1ff4f5cfd4c67 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/bnx2.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1ec4de28743a..9a3205fe6c9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efde73a35c2fc88db26a1583b19e0ab0fdfcd4f8
+refs/heads/master: e9f26c49ce790de0064474f97d6402ce1fefac2a
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index 48bc57803856..063f28394e3d 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -7141,6 +7141,13 @@ bnx2_change_ring_size(struct bnx2 *bp, u32 rx, u32 tx)
 			dev_close(bp->dev);
 			return rc;
 		}
+#ifdef BCM_CNIC
+		mutex_lock(&bp->cnic_lock);
+		/* Let cnic know about the new status block. */
+		if (bp->cnic_eth_dev.drv_state & CNIC_DRV_STATE_REGD)
+			bnx2_setup_cnic_irq_info(bp);
+		mutex_unlock(&bp->cnic_lock);
+#endif
 		bnx2_netif_start(bp);
 	}
 	return 0;