[PATCH NEXT 2/5] netxen: fix corner cases of firmware recovery

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Amit Kumar Salecha
Date: Monday, March 29, 2010 - 5:43 am

Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>

o DEV_NEED_RESET state was not handled during fw intialization phase.
o nx_decr_dev_ref_cnt() can return error, if fail to grab pcie seamphore.
---
 drivers/net/netxen/netxen_nic_main.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 08780ef..68903bf 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -2294,6 +2294,7 @@ netxen_fwinit_work(struct work_struct *work)
 		}
 		break;
 
+	case NX_DEV_NEED_RESET:
 	case NX_DEV_INITALIZING:
 		if (++adapter->fw_wait_cnt < FW_POLL_THRESH) {
 			netxen_schedule_work(adapter,
@@ -2337,6 +2338,9 @@ netxen_detach_work(struct work_struct *work)
 
 	ref_cnt = nx_decr_dev_ref_cnt(adapter);
 
+	if (ref_cnt == -EIO)
+		goto err_ret;
+
 	delay = (ref_cnt == 0) ? 0 : (2 * FW_POLL_DELAY);
 
 	adapter->fw_wait_cnt = 0;
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH NEXT 0/5]netxen: fw file validation and fixes, Amit Kumar Salecha, (Mon Mar 29, 5:43 am)
[PATCH NEXT 1/5] netxen: fix tx csum status, Amit Kumar Salecha, (Mon Mar 29, 5:43 am)
[PATCH NEXT 2/5] netxen: fix corner cases of firmware recovery, Amit Kumar Salecha, (Mon Mar 29, 5:43 am)
[PATCH NEXT 3/5] netxen: validate unified romimage, Amit Kumar Salecha, (Mon Mar 29, 5:43 am)
[PATCH NEXT 4/5] netxen: fix fw load from file, Amit Kumar Salecha, (Mon Mar 29, 5:43 am)
[PATCH NEXT 5/5] netxen: fix interrupt for NX2031, Amit Kumar Salecha, (Mon Mar 29, 5:43 am)