netxen: fix tx timeout recovery for NX2031 chip
authorAmit Kumar Salecha <amit.salecha@qlogic.com>
Tue, 2 Feb 2010 04:16:20 +0000 (04:16 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 4 Feb 2010 03:15:24 +0000 (19:15 -0800)
For NX2031, first try to scrub interrupt before requesting firmware
reset. Return statement was missing after scrubbbing interrupt.

Signed-off-by: Vernon Mauery <vernux@us.ibm.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/netxen/netxen_nic_main.c

index 9f9d6081959b6f64ebfebba1384ec353f175ed64..5209095a8739d348543395f207b16225ade3373a 100644 (file)
@@ -1941,7 +1941,7 @@ static void netxen_tx_timeout_task(struct work_struct *work)
                netif_wake_queue(adapter->netdev);
 
                clear_bit(__NX_RESETTING, &adapter->state);
-
+               return;
        } else {
                clear_bit(__NX_RESETTING, &adapter->state);
                if (!netxen_nic_reset_context(adapter)) {