---

yaml --- r: 149801 b: refs/heads/master c: daba2a6 h: refs/heads/master i: 149799: fae094e v: v3
git-mirror · Apr 21, 2009 · 1bdbf61 · 1bdbf61
1 parent 373c0db
commit 1bdbf61
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cf74ebb634fe79587cf9a1d5ff971391dd12e1b
+refs/heads/master: daba2a631d2b7831b6a021b36d61314a9153526e
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
@@ -2456,8 +2456,6 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
 		}
 	}
 
-	__tg3_set_mac_addr(tp, 0);
-
 	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
 		u32 val;
 
@@ -6357,6 +6355,8 @@ static int tg3_halt(struct tg3 *tp, int kind, int silent)
 	tg3_abort_hw(tp, silent);
 	err = tg3_chip_reset(tp);
 
+	__tg3_set_mac_addr(tp, 0);
+
 	tg3_write_sig_legacy(tp, kind);
 	tg3_write_sig_post_reset(tp, kind);