From: Chad Dupuis <cdupuis@redhat.com> Date: Tue, 3 Aug 2010 13:51:19 -0400 Subject: [net] netxen: fix corner cases of firmware recovery Message-id: <20100803134835.2239.7997.sendpatchset@localhost.localdomain> Patchwork-id: 27333 O-Subject: [RHEL 5.6 PATCH 31/44] netxen: fix corner cases of firmware recovery Bugzilla: 562937 RH-Acked-by: David S. Miller <davem@redhat.com> RH-Acked-by: Neil Horman <nhorman@redhat.com> Bugzilla ======== 562937 Upstream Status =============== net-2.6 commit id 6b50ea1516fab30ce5843e5b11e43488f38c776d Description =========== >From 4374a34428be75bd415219bb1bd1705be7d0036c Mon Sep 17 00:00:00 2001 From: Amit Kumar Salecha <amit.salecha@qlogic.com> Date: Mon, 29 Mar 2010 02:43:42 +0000 Subject: [PATCH] netxen: fix corner cases of firmware recovery 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. Signed-off-by: David S. Miller <davem@davemloft.net> diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 0ee56a8..e1cf4de 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -2347,6 +2347,7 @@ netxen_fwinit_work(void *data) } break; + case NX_DEV_NEED_RESET: case NX_DEV_INITALIZING: if (++adapter->fw_wait_cnt < FW_POLL_THRESH) { netxen_schedule_work(adapter, @@ -2389,6 +2390,9 @@ netxen_detach_work(void *data) 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;