projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6d18168
)
qlcnic: disable tx timeout recovery
author
Amit Kumar Salecha
<amit.salecha@qlogic.com>
Tue, 13 Jul 2010 20:33:32 +0000
(20:33 +0000)
committer
David S. Miller
<davem@davemloft.net>
Wed, 14 Jul 2010 20:54:15 +0000
(13:54 -0700)
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>
drivers/net/qlcnic/qlcnic_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/qlcnic/qlcnic_main.c
b/drivers/net/qlcnic/qlcnic_main.c
index
4d18313
..
0fef8c3
100644
(file)
--- 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");