From: Amit Kumar Salecha Date: Tue, 13 Jul 2010 20:33:32 +0000 (+0000) Subject: qlcnic: disable tx timeout recovery X-Git-Tag: MMI-PSA29.97-13-9~23092^2~232 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0df170b6078c58d1d2118a5f657fe366ecdc1262;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git qlcnic: disable tx timeout recovery Disable tx timeout recovery, if auto_fw_reset is disable Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller --- diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c index 4d1831350efa..0fef8c3c553f 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");