lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qlcnic: disable tx timeout recovery

Browse Source 
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>
This commit is contained in:
Amit Kumar Salecha
2010-07-13 20:33:32 +00:00
committed by David S. Miller
parent 6d18168895
commit 0df170b607
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/qlcnic/qlcnic_main.c
View File

@@ -2581,7 +2581,8 @@ qlcnic_check_health(struct qlcnic_adapter *adapter)
if (adapter->need_fw_reset) if (adapter->need_fw_reset)
goto detach; goto detach;
if (adapter->reset_context) { if (adapter->reset_context &&
auto_fw_reset == AUTO_FW_RESET_ENABLED) {
qlcnic_reset_hw_context(adapter); qlcnic_reset_hw_context(adapter);
adapter->netdev->trans_start = jiffies; adapter->netdev->trans_start = jiffies;
} }
@@ -2594,7 +2595,8 @@ qlcnic_check_health(struct qlcnic_adapter *adapter)
qlcnic_dev_request_reset(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"); dev_info(&netdev->dev, "firmware hang detected\n");