From b6c4a538c08619317e5df2793e3c0e9db39ca5f2 Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Fri, 5 May 2006 01:26:29 +0200 Subject: [PATCH] --- yaml --- r: 26587 b: refs/heads/master c: f9f7b9602ecb66f55718d6d1afa3e2b1e721b22d h: refs/heads/master i: 26585: e8db619c11189db7ae65d299425367b6d1abe08e 26583: d768eeabeb6cfccf43797614afb0686be6a1d318 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8c6ccb627d3b..5a6e221a4063 100644 --- 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 index 9a06e61df0a2..4be2d9b5749b 100644 --- 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);