From bba5722a9fa5db42c3b5603c70ff95914f99d643 Mon Sep 17 00:00:00 2001
From: Amit Kumar Salecha <amit.salecha@qlogic.com>
Date: Tue, 2 Feb 2010 04:16:20 +0000
Subject: [PATCH] --- yaml --- r: 180393 b: refs/heads/master c:
 41f3e0b1f524c47908e944a7e55f11c371ddddec h: refs/heads/master i:   180391:
 617fc8b322be1f07040e59a153742ed69e49c96b v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/netxen/netxen_nic_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 20c679f2d738..2a0e3fda5071 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1386be55e32a3c5d8ef4a2b243c530a7b664c02c
+refs/heads/master: 41f3e0b1f524c47908e944a7e55f11c371ddddec
diff --git a/trunk/drivers/net/netxen/netxen_nic_main.c b/trunk/drivers/net/netxen/netxen_nic_main.c
index 9f9d6081959b..5209095a8739 100644
--- a/trunk/drivers/net/netxen/netxen_nic_main.c
+++ b/trunk/drivers/net/netxen/netxen_nic_main.c
@@ -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)) {