From f4e328bcc1ce4e6e194734d5fe7da739e6757d47 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Mon, 21 Sep 2009 15:39:37 +0000
Subject: [PATCH] --- yaml --- r: 166245 b: refs/heads/master c:
 6ef57a0ea77e7bf4123a06da895a0e26312b5737 h: refs/heads/master i:   166243:
 581d50db19842f85e7b253807e141ebef8856eba v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/cnic.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 92d49b45c6ce..eef76a9c7f09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68f40152747da28ae0de21633c9062671448b66c
+refs/heads/master: 6ef57a0ea77e7bf4123a06da895a0e26312b5737
diff --git a/trunk/drivers/net/cnic.c b/trunk/drivers/net/cnic.c
index d45eacb76702..211c8e9182fc 100644
--- a/trunk/drivers/net/cnic.c
+++ b/trunk/drivers/net/cnic.c
@@ -85,8 +85,6 @@ static int cnic_uio_open(struct uio_info *uinfo, struct inode *inode)
 
 	cp->uio_dev = iminor(inode);
 
-	cnic_shutdown_bnx2_rx_ring(dev);
-
 	cnic_init_bnx2_tx_ring(dev);
 	cnic_init_bnx2_rx_ring(dev);
 
@@ -98,6 +96,8 @@ static int cnic_uio_close(struct uio_info *uinfo, struct inode *inode)
 	struct cnic_dev *dev = uinfo->priv;
 	struct cnic_local *cp = dev->cnic_priv;
 
+	cnic_shutdown_bnx2_rx_ring(dev);
+
 	cp->uio_dev = -1;
 	return 0;
 }