diff options
| author | Amit Kumar Salecha <amit.salecha@qlogic.com> | 2009-10-21 19:39:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-22 18:27:50 -0700 |
| commit | ff8a306d63a01f15f166039de94c448c76140d1d (patch) | |
| tree | 7a78d3b3136874c3da202dfd2708eea84f2eb4cd /drivers/net/netxen/netxen_nic_main.c | |
| parent | 8bee0a91dd2f472d51dc107288c988ae0a0f371a (diff) | |
| download | blackbird-op-linux-ff8a306d63a01f15f166039de94c448c76140d1d.tar.gz blackbird-op-linux-ff8a306d63a01f15f166039de94c448c76140d1d.zip | |
netxen: fix tx timeout handling on firmware hang
Clear NX_RESETING bit in netxen_tx_timeout_task() so that
the firmware watchdog task can catch need_reset request
from tx timeout.
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_main.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 7fc15e9e8adb..0b4a56a8c8d5 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -1919,6 +1919,7 @@ static void netxen_tx_timeout_task(struct work_struct *work) request_reset: adapter->need_fw_reset = 1; + clear_bit(__NX_RESETTING, &adapter->state); } struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev) |
