Browse Source

[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>
Stefano Brivio 19 years ago
parent
commit
f9f7b9602e
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/net/wireless/bcm43xx/bcm43xx_main.c

+ 1 - 1
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);
 	bcm43xx_pctl_set_crystal(bcm, 0);
 
 
 	/* Set the MAC address in the networking subsystem */
 	/* 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);
 		memcpy(bcm->net_dev->dev_addr, bcm->sprom.et1macaddr, 6);
 	else
 	else
 		memcpy(bcm->net_dev->dev_addr, bcm->sprom.il0macaddr, 6);
 		memcpy(bcm->net_dev->dev_addr, bcm->sprom.il0macaddr, 6);