aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorAmit Kumar Salecha <amit.salecha@qlogic.com>2010-05-13 03:07:42 +0000
committerDavid S. Miller <davem@davemloft.net>2010-05-14 03:06:52 -0700
commit2372a5f1c869fd1e4dc11fb41600197fcce1121c (patch)
tree53e1960f00ce51368d4019a0321d40f26c20035b /drivers/net
parentsky2: version 1.28 (diff)
downloadlinux-dev-2372a5f1c869fd1e4dc11fb41600197fcce1121c.tar.xz
linux-dev-2372a5f1c869fd1e4dc11fb41600197fcce1121c.zip
qlcnic: fix context cleanup
Before going for recovery, every pci-func should check fw state, irrespective of device state. This to avoid unnecssary sending of command for ctx destroy. Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/qlcnic/qlcnic_main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 0a2d7148f650..3d90bb2fc7db 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -2301,10 +2301,8 @@ qlcnic_check_health(struct qlcnic_adapter *adapter)
if (qlcnic_check_temp(adapter))
goto detach;
- if (adapter->need_fw_reset) {
+ if (adapter->need_fw_reset)
qlcnic_dev_request_reset(adapter);
- goto detach;
- }
state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE);
if (state == QLCNIC_DEV_NEED_RESET || state == QLCNIC_DEV_NEED_QUISCENT)