From d12115f9fe9fae1f21a982d263d987495f4a8210 Mon Sep 17 00:00:00 2001
From: Sritej Velaga <sritej.velaga@qlogic.com>
Date: Fri, 29 Jul 2011 13:30:27 +0000
Subject: [PATCH] --- yaml --- r: 265162 b: refs/heads/master c:
 032a13c7d70f3f40877b298e4c62469980f27a1f h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/qlcnic/qlcnic.h      | 1 +
 trunk/drivers/net/qlcnic/qlcnic_init.c | 3 ++-
 trunk/drivers/net/qlcnic/qlcnic_main.c | 5 +++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 072a474b7ac5..61a691444d31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d46512c642248fcb33f3b3ee2b2a80e2b09cd9c
+refs/heads/master: 032a13c7d70f3f40877b298e4c62469980f27a1f
diff --git a/trunk/drivers/net/qlcnic/qlcnic.h b/trunk/drivers/net/qlcnic/qlcnic.h
index 4200ef81ca8e..5f0141be8ca9 100644
--- a/trunk/drivers/net/qlcnic/qlcnic.h
+++ b/trunk/drivers/net/qlcnic/qlcnic.h
@@ -911,6 +911,7 @@ struct qlcnic_ipaddr {
 #define QLCNIC_PROMISC_DISABLED		0x800
 #define QLCNIC_NEED_FLR			0x1000
 #define QLCNIC_FW_RESET_OWNER		0x2000
+#define QLCNIC_FW_HANG			0x4000
 #define QLCNIC_IS_MSI_FAMILY(adapter) \
 	((adapter)->flags & (QLCNIC_MSI_ENABLED | QLCNIC_MSIX_ENABLED))
 
diff --git a/trunk/drivers/net/qlcnic/qlcnic_init.c b/trunk/drivers/net/qlcnic/qlcnic_init.c
index ee8a3982395e..3b6741e4754d 100644
--- a/trunk/drivers/net/qlcnic/qlcnic_init.c
+++ b/trunk/drivers/net/qlcnic/qlcnic_init.c
@@ -1056,7 +1056,8 @@ qlcnic_check_fw_hearbeat(struct qlcnic_adapter *adapter)
 int
 qlcnic_need_fw_reset(struct qlcnic_adapter *adapter)
 {
-	if (qlcnic_check_fw_hearbeat(adapter)) {
+	if ((adapter->flags & QLCNIC_FW_HANG) ||
+			qlcnic_check_fw_hearbeat(adapter)) {
 		qlcnic_rom_lock_recovery(adapter);
 		return 1;
 	}
diff --git a/trunk/drivers/net/qlcnic/qlcnic_main.c b/trunk/drivers/net/qlcnic/qlcnic_main.c
index 5ca1b562443c..248ebbd43279 100644
--- a/trunk/drivers/net/qlcnic/qlcnic_main.c
+++ b/trunk/drivers/net/qlcnic/qlcnic_main.c
@@ -2682,6 +2682,7 @@ qlcnic_clr_all_drv_state(struct qlcnic_adapter *adapter, u8 failed)
 	qlcnic_api_unlock(adapter);
 err:
 	adapter->fw_fail_cnt = 0;
+	adapter->flags &= ~QLCNIC_FW_HANG;
 	clear_bit(__QLCNIC_START_FW, &adapter->state);
 	clear_bit(__QLCNIC_RESETTING, &adapter->state);
 }
@@ -2859,6 +2860,7 @@ qlcnic_fwinit_work(struct work_struct *work)
 		    (adapter->flags & QLCNIC_FW_RESET_OWNER)) {
 			QLCDB(adapter, DRV, "Take FW dump\n");
 			qlcnic_dump_fw(adapter);
+			adapter->flags |= QLCNIC_FW_HANG;
 		}
 		rtnl_unlock();
 
@@ -3046,6 +3048,7 @@ qlcnic_attach_work(struct work_struct *work)
 done:
 	netif_device_attach(netdev);
 	adapter->fw_fail_cnt = 0;
+	adapter->flags &= ~QLCNIC_FW_HANG;
 	clear_bit(__QLCNIC_RESETTING, &adapter->state);
 
 	if (!qlcnic_clr_drv_state(adapter))
@@ -3090,6 +3093,8 @@ qlcnic_check_health(struct qlcnic_adapter *adapter)
 	if (++adapter->fw_fail_cnt < FW_FAIL_THRESH)
 		return 0;
 
+	adapter->flags |= QLCNIC_FW_HANG;
+
 	qlcnic_dev_request_reset(adapter);
 
 	if (auto_fw_reset)