---

yaml --- r: 22223 b: refs/heads/master c: e75f7c9 h: refs/heads/master i: 22221: d05305f 22219: e0ff113 22215: 651192c 22207: bfca510 v: v3
git-mirror · Mar 21, 2006 · 3425f34 · 3425f34
1 parent 71aac11
commit 3425f34
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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);