2 files changed, 6 insertions, 1 deletions

diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 02f8d4b4db63..ba62411f3532 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -778,6 +778,9 @@ netxen_need_fw_reset(struct netxen_adapter *adapter)
         if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
                 return 1;
 
+        if (adapter->need_fw_reset)
+                return 1;
+
         /* last attempt had failed */
         if (NXRD32(adapter, CRB_CMDPEG_STATE) == PHAN_INITIALIZE_FAILED)
                 return 1;
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 41cb0af4b556..1aca6260909a 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -2284,8 +2284,10 @@ netxen_check_health(struct netxen_adapter *adapter)
         }
 
         state = NXRD32(adapter, NX_CRB_DEV_STATE);
-        if (state == NX_DEV_NEED_RESET)
+        if (state == NX_DEV_NEED_RESET) {
+                adapter->need_fw_reset = 1;
                 goto detach;
+        }
 
         if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
                 return 0;