From 3425f34fb35eb3d0edec0977888776531f296f97 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Mon, 20 Mar 2006 21:33:26 -0800
Subject: [PATCH] --- yaml --- r: 22223 b: refs/heads/master c:
 e75f7c900944aa90831f6d343ca40090a68b56dd h: refs/heads/master i:   22221:
 d05305fc79ed8246970e25f82687bbe588d3e085   22219:
 e0ff1136581fe7fd5db788e8298367171cf331ba   22215:
 651192c379d9484cc4b256c20fd9776b6fff0a53   22207:
 bfca510bec2eb711f37178754351bd62721cade4 v: v3

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

diff --git a/[refs] b/[refs]
index 295671022b74..a3f9c5c35540 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e7b13685f9a06949ea3070c97c0f0085a08cd37
+refs/heads/master: e75f7c900944aa90831f6d343ca40090a68b56dd
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index 994658d26b8e..f7da3bf2fa09 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -5537,6 +5537,9 @@ static int tg3_set_mac_addr(struct net_device *dev, void *p)
 
 	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
 
+	if (!netif_running(dev))
+		return 0;
+
 	spin_lock_bh(&tp->lock);
 	__tg3_set_mac_addr(tp);
 	spin_unlock_bh(&tp->lock);
@@ -7192,6 +7195,9 @@ static void tg3_set_rx_mode(struct net_device *dev)
 {
 	struct tg3 *tp = netdev_priv(dev);
 
+	if (!netif_running(dev))
+		return;
+
 	tg3_full_lock(tp, 0);
 	__tg3_set_rx_mode(dev);
 	tg3_full_unlock(tp);