netxen: fix tx timeout handling on firmware hang
authorAmit Kumar Salecha <amit.salecha@qlogic.com>
Wed, 21 Oct 2009 19:39:02 +0000 (19:39 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Oct 2009 01:27:50 +0000 (18:27 -0700)
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>
drivers/net/netxen/netxen_nic_main.c

index 7fc15e9e8adb89584c710067ff12d0709fd56d0e..0b4a56a8c8d5fc2d9d9d1f8619e88e2031577a55 100644 (file)
@@ -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)