diff options
| author | Sritej Velaga <sritej.velaga@qlogic.com> | 2011-07-29 13:30:27 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-01 00:12:00 -0700 |
| commit | 032a13c7d70f3f40877b298e4c62469980f27a1f (patch) | |
| tree | 978285a52c0bc10207ede3da5d0d9fd2833822a3 /drivers/net/qlcnic/qlcnic_init.c | |
| parent | 3d46512c642248fcb33f3b3ee2b2a80e2b09cd9c (diff) | |
| download | linux-032a13c7d70f3f40877b298e4c62469980f27a1f.tar.gz linux-032a13c7d70f3f40877b298e4c62469980f27a1f.tar.bz2 linux-032a13c7d70f3f40877b298e4c62469980f27a1f.zip | |
qlcnic: Fix delay in reset path
Driver should not check for heart beat anymore when FW is hung, rather it
should restart the FW.
Signed-off-by: Sritej Velaga <sritej.velaga@qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlcnic/qlcnic_init.c')
| -rw-r--r-- | drivers/net/qlcnic/qlcnic_init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/qlcnic/qlcnic_init.c b/drivers/net/qlcnic/qlcnic_init.c index ee8a3982395e..3b6741e4754d 100644 --- a/drivers/net/qlcnic/qlcnic_init.c +++ b/drivers/net/qlcnic/qlcnic_init.c @@ -1056,7 +1056,8 @@ qlcnic_check_fw_hearbeat(struct qlcnic_adapter *adapter) int qlcnic_need_fw_reset(struct qlcnic_adapter *adapter) { - if (qlcnic_check_fw_hearbeat(adapter)) { + if ((adapter->flags & QLCNIC_FW_HANG) || + qlcnic_check_fw_hearbeat(adapter)) { qlcnic_rom_lock_recovery(adapter); return 1; } |