The following commit has been merged in the linux branch: commit ff8a306d63a01f15f166039de94c448c76140d1d Author: Amit Kumar Salecha amit.salecha@qlogic.com Date: Wed Oct 21 19:39:02 2009 +0000

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

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 7fc15e9..0b4a56a 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)