diff options
| author | Stefano Brivio <stefano.brivio@polimi.it> | 2006-05-05 01:26:29 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-05 22:55:23 +0200 |
| commit | f9f7b9602ecb66f55718d6d1afa3e2b1e721b22d (patch) | |
| tree | 9d0e0ce31b1236228d0f128ff2bbf4de20223b44 /drivers/net/wireless | |
| parent | [PATCH] ieee80211: Fix A band channel count (resent) (diff) | |
| download | linux-f9f7b9602ecb66f55718d6d1afa3e2b1e721b22d.tar.xz linux-f9f7b9602ecb66f55718d6d1afa3e2b1e721b22d.zip | |
[PATCH] bcm43xx: check for valid MAC address in SPROM
Check for valid MAC address in SPROM fields instead of relying on
PHY type while setting the MAC address in the networking subsystem,
as some devices have multiple PHYs.
Signed-off-by: Stefano Brivio <stefano.brivio@polimi.it>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c index 9a06e61df0a2..4be2d9b5749b 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/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); |