diff options
| author | Amit Kumar Salecha <amit.salecha@qlogic.com> | 2010-07-13 20:33:32 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-14 13:54:15 -0700 |
| commit | 0df170b6078c58d1d2118a5f657fe366ecdc1262 (patch) | |
| tree | 642a9ab004c64484f41033a8f2e3277cfbb502a0 | |
| parent | 6d181688953465c76c375c665a557c1ff88dcc40 (diff) | |
qlcnic: disable tx timeout recovery
Disable tx timeout recovery, if auto_fw_reset is disable
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/qlcnic/qlcnic_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c index 4d1831350ef..0fef8c3c553 100644 --- a/drivers/net/qlcnic/qlcnic_main.c +++ b/drivers/net/qlcnic/qlcnic_main.c @@ -2581,7 +2581,8 @@ qlcnic_check_health(struct qlcnic_adapter *adapter) if (adapter->need_fw_reset) goto detach; - if (adapter->reset_context) { + if (adapter->reset_context && + auto_fw_reset == AUTO_FW_RESET_ENABLED) { qlcnic_reset_hw_context(adapter); adapter->netdev->trans_start = jiffies; } @@ -2594,7 +2595,8 @@ qlcnic_check_health(struct qlcnic_adapter *adapter) qlcnic_dev_request_reset(adapter); - clear_bit(__QLCNIC_FW_ATTACHED, &adapter->state); + if ((auto_fw_reset == AUTO_FW_RESET_ENABLED)) + clear_bit(__QLCNIC_FW_ATTACHED, &adapter->state); dev_info(&netdev->dev, "firmware hang detected\n"); |