From 5c22a12b011760b2e59083915f68afaf5e84c001 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Wed, 11 Jul 2007 19:47:19 -0700
Subject: [PATCH] --- yaml --- r: 59062 b: refs/heads/master c:
 469665459d26da8d0b46c70d070da1e192e48e46 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5eccbe518735..e7a587e520b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db3d99c090e0cdb34b1274767e062bfddbb384bc
+refs/heads/master: 469665459d26da8d0b46c70d070da1e192e48e46
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index 3a43426ced32..314f5cfe7246 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -3512,9 +3512,9 @@ static inline int tg3_irq_sync(struct tg3 *tp)
  */
 static inline void tg3_full_lock(struct tg3 *tp, int irq_sync)
 {
+	spin_lock_bh(&tp->lock);
 	if (irq_sync)
 		tg3_irq_quiesce(tp);
-	spin_lock_bh(&tp->lock);
 }
 
 static inline void tg3_full_unlock(struct tg3 *tp)
@@ -9116,10 +9116,10 @@ static void tg3_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
 	/* Update RX_MODE_KEEP_VLAN_TAG bit in RX_MODE register. */
 	__tg3_set_rx_mode(dev);
 
-	tg3_full_unlock(tp);
-
 	if (netif_running(dev))
 		tg3_netif_start(tp);
+
+	tg3_full_unlock(tp);
 }
 #endif