From 3694db42bc761f03d3f697f8623b9ced681103ef Mon Sep 17 00:00:00 2001
From: Amit Kumar Salecha <amit.salecha@qlogic.com>
Date: Tue, 2 Feb 2010 04:16:21 +0000
Subject: [PATCH] --- yaml --- r: 180394 b: refs/heads/master c:
 e15eec2805565c7e31dbe402215637012f1e4616 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2a0e3fda5071..b282c049403f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41f3e0b1f524c47908e944a7e55f11c371ddddec
+refs/heads/master: e15eec2805565c7e31dbe402215637012f1e4616
diff --git a/trunk/drivers/net/netxen/netxen_nic_main.c b/trunk/drivers/net/netxen/netxen_nic_main.c
index 5209095a8739..24279e6e55f5 100644
--- a/trunk/drivers/net/netxen/netxen_nic_main.c
+++ b/trunk/drivers/net/netxen/netxen_nic_main.c
@@ -2240,7 +2240,9 @@ netxen_detach_work(struct work_struct *work)
 
 	netxen_nic_down(adapter, netdev);
 
+	rtnl_lock();
 	netxen_nic_detach(adapter);
+	rtnl_unlock();
 
 	status = NXRD32(adapter, NETXEN_PEG_HALT_STATUS1);