From a089f9520b5ea0999e17a613f3b263542b9385ab Mon Sep 17 00:00:00 2001 From: Amit Kumar Salecha Date: Tue, 8 Dec 2009 20:40:55 +0000 Subject: [PATCH] --- yaml --- r: 183229 b: refs/heads/master c: 6a808c6c02fb9f0ffa24ac7cca6cfc323cf98b21 h: refs/heads/master i: 183227: e0a721e162163af5cc6d1fa4e2456525ff047f76 v: v3 --- [refs] | 2 +- trunk/drivers/net/netxen/netxen_nic_init.c | 3 +++ trunk/drivers/net/netxen/netxen_nic_main.c | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 41d7b490920a..3364098abd7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc86fcbac0a86a93ee65cc31769c4e83e6ff2295 +refs/heads/master: 6a808c6c02fb9f0ffa24ac7cca6cfc323cf98b21 diff --git a/trunk/drivers/net/netxen/netxen_nic_init.c b/trunk/drivers/net/netxen/netxen_nic_init.c index 02f8d4b4db63..ba62411f3532 100644 --- a/trunk/drivers/net/netxen/netxen_nic_init.c +++ b/trunk/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/trunk/drivers/net/netxen/netxen_nic_main.c b/trunk/drivers/net/netxen/netxen_nic_main.c index 41cb0af4b556..1aca6260909a 100644 --- a/trunk/drivers/net/netxen/netxen_nic_main.c +++ b/trunk/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;