From 1d27e5e0243ec6796feeca8da0db0521c49e40be Mon Sep 17 00:00:00 2001
From: Ron Mercer <ron.mercer@qlogic.com>
Date: Mon, 9 Mar 2009 10:59:17 +0000
Subject: [PATCH] --- yaml --- r: 135115 b: refs/heads/master c:
 db98812f6bbe17c5994d6290a68f8de8aa5ff8b9 h: refs/heads/master i:   135113:
 da446a7d378b43f9a1daf1c717c5596e99eed18b   135111:
 5c5c744eac757d080a80ae91a30af078ea2e2f03 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/net/qlge/qlge_main.c | 41 +++++++++++++-----------------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index c17f8efd7175..1b3e1c87b166 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a77733ccb9654716160fdfb3f1f2a9e1759de19
+refs/heads/master: db98812f6bbe17c5994d6290a68f8de8aa5ff8b9
diff --git a/trunk/drivers/net/qlge/qlge_main.c b/trunk/drivers/net/qlge/qlge_main.c
index d800ff40b32b..ed7138d07bad 100644
--- a/trunk/drivers/net/qlge/qlge_main.c
+++ b/trunk/drivers/net/qlge/qlge_main.c
@@ -3263,28 +3263,6 @@ static int ql_adapter_up(struct ql_adapter *qdev)
 	return err;
 }
 
-static int ql_cycle_adapter(struct ql_adapter *qdev)
-{
-	int status;
-
-	status = ql_adapter_down(qdev);
-	if (status)
-		goto error;
-
-	status = ql_adapter_up(qdev);
-	if (status)
-		goto error;
-
-	return status;
-error:
-	QPRINTK(qdev, IFUP, ALERT,
-		"Driver up/down cycle failed, closing device\n");
-	rtnl_lock();
-	dev_close(qdev->ndev);
-	rtnl_unlock();
-	return status;
-}
-
 static void ql_release_adapter_resources(struct ql_adapter *qdev)
 {
 	ql_free_mem_resources(qdev);
@@ -3617,7 +3595,24 @@ static void ql_asic_reset_work(struct work_struct *work)
 {
 	struct ql_adapter *qdev =
 	    container_of(work, struct ql_adapter, asic_reset_work.work);
-	ql_cycle_adapter(qdev);
+	int status;
+
+	status = ql_adapter_down(qdev);
+	if (status)
+		goto error;
+
+	status = ql_adapter_up(qdev);
+	if (status)
+		goto error;
+
+	return;
+error:
+	QPRINTK(qdev, IFUP, ALERT,
+		"Driver up/down cycle failed, closing device\n");
+	rtnl_lock();
+	set_bit(QL_ADAPTER_UP, &qdev->flags);
+	dev_close(qdev->ndev);
+	rtnl_unlock();
 }
 
 static struct nic_operations qla8012_nic_ops = {