Skip to content

Commit

Permalink
qlcnic: disable tx timeout recovery
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Amit Kumar Salecha authored and David S. Miller committed Jul 14, 2010
1 parent 6d18168 commit 0df170b
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/net/qlcnic/qlcnic_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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");

Expand Down

0 comments on commit 0df170b

Please sign in to comment.