From 5570e5b40ff94f57742d912eecfd2a1d5403ba95 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Thu, 10 Dec 2009 15:40:58 +0000
Subject: [PATCH] --- yaml --- r: 175566 b: refs/heads/master c:
 4e9c4fd3e7e022c7a5b8bb7cd06bf914b202cfea h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/cnic.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a3467f275c64..79382ee2be7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bcdc32cf4d94442eba79599ce8438ea0b8f78b5
+refs/heads/master: 4e9c4fd3e7e022c7a5b8bb7cd06bf914b202cfea
diff --git a/trunk/drivers/net/cnic.c b/trunk/drivers/net/cnic.c
index a2c33289326a..4332b3a2fafb 100644
--- a/trunk/drivers/net/cnic.c
+++ b/trunk/drivers/net/cnic.c
@@ -1104,6 +1104,8 @@ static int cnic_alloc_bnx2x_resc(struct cnic_dev *dev)
 	cp->bnx2x_status_blk = cp->status_blk;
 	cp->bnx2x_def_status_blk = cp->ethdev->irq_arr[1].status_blk;
 
+	memset(cp->bnx2x_status_blk, 0, sizeof(struct host_status_block));
+
 	cp->l2_rx_ring_size = 15;
 
 	ret = cnic_alloc_l2_rings(dev, 4);
@@ -4295,6 +4297,9 @@ static void cnic_stop_bnx2x_hw(struct cnic_dev *dev)
 		  offsetof(struct cstorm_status_block_c,
 			   index_values[HC_INDEX_C_ISCSI_EQ_CONS]),
 		  0);
+	CNIC_WR(dev, BAR_CSTRORM_INTMEM +
+		CSTORM_ISCSI_EQ_CONS_OFFSET(cp->func, 0), 0);
+	CNIC_WR16(dev, cp->kcq_io_addr, 0);
 	cnic_free_resc(dev);
 }