---

yaml --- r: 26587 b: refs/heads/master c: f9f7b96 h: refs/heads/master i: 26585: e8db619 26583: d768eea v: v3
git-mirror · May 5, 2006 · b6c4a53 · b6c4a53
1 parent fd1b2e1
commit b6c4a53
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f21709d70ad6d7ad50288f7056c3a368138b017c
+refs/heads/master: f9f7b9602ecb66f55718d6d1afa3e2b1e721b22d
diff --git a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -3482,7 +3482,7 @@ static int bcm43xx_attach_board(struct bcm43xx_private *bcm)
 	bcm43xx_pctl_set_crystal(bcm, 0);
 
 	/* Set the MAC address in the networking subsystem */
-	if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A)
+	if (is_valid_ether_addr(bcm->sprom.et1macaddr))
 		memcpy(bcm->net_dev->dev_addr, bcm->sprom.et1macaddr, 6);
 	else
 		memcpy(bcm->net_dev->dev_addr, bcm->sprom.il0macaddr, 6);