From: Amit Kumar Salecha Date: Wed, 21 Oct 2009 19:39:02 +0000 (+0000) Subject: netxen: fix tx timeout handling on firmware hang X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ff8a306d63a01f15f166039de94c448c76140d1d;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller --- 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)