adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-02 14:13:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

DM9000: Show the MAC address source after printing MAC

Browse source 
Show whether the MAC address was read from the EEPROM or
the onboard PAR registers.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Ben Dooks 2008-02-05 00:02:23 +00:00 committed by Jeff Garzik
parent 513b6bee01
commit 179c743ff1
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/net/dm9000.c
View file

@ -509,6 +509,7 @@ dm9000_probe(struct platform_device *pdev)
struct dm9000_plat_data *pdata = pdev->dev.platform_data; struct dm9000_plat_data *pdata = pdev->dev.platform_data;
struct board_info *db; /* Point a board information structure */ struct board_info *db; /* Point a board information structure */
struct net_device *ndev; struct net_device *ndev;
const unsigned char *mac_src;
unsigned long base; unsigned long base;
int ret = 0; int ret = 0;
int iosize; int iosize;
@ -687,13 +688,16 @@ dm9000_probe(struct platform_device *pdev)
db->mii.mdio_read = dm9000_phy_read; db->mii.mdio_read = dm9000_phy_read;
db->mii.mdio_write = dm9000_phy_write; db->mii.mdio_write = dm9000_phy_write;
mac_src = "eeprom";
/* try reading the node address from the attached EEPROM */ /* try reading the node address from the attached EEPROM */
for (i = 0; i < 6; i += 2) for (i = 0; i < 6; i += 2)
dm9000_read_eeprom(db, i / 2, ndev->dev_addr+i); dm9000_read_eeprom(db, i / 2, ndev->dev_addr+i);
if (!is_valid_ether_addr(ndev->dev_addr)) { if (!is_valid_ether_addr(ndev->dev_addr)) {
/* try reading from mac */ /* try reading from mac */
mac_src = "chip";
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
ndev->dev_addr[i] = ior(db, i+DM9000_PAR); ndev->dev_addr[i] = ior(db, i+DM9000_PAR);
} }
@ -707,9 +711,9 @@ dm9000_probe(struct platform_device *pdev)
if (ret == 0) { if (ret == 0) {
DECLARE_MAC_BUF(mac); DECLARE_MAC_BUF(mac);
printk("%s: dm9000 at %p,%p IRQ %d MAC: %s\n", printk("%s: dm9000 at %p,%p IRQ %d MAC: %s (%s)\n",
ndev->name, db->io_addr, db->io_data, ndev->irq, ndev->name, db->io_addr, db->io_data, ndev->irq,
print_mac(mac, ndev->dev_addr)); print_mac(mac, ndev->dev_addr), mac_src);
} }
return 0; return 0;