diff options
Diffstat (limited to 'drivers/net/arm/at91_ether.c')
-rw-r--r-- | drivers/net/arm/at91_ether.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c index 619810a01e5b..25b114a4e2b1 100644 --- a/drivers/net/arm/at91_ether.c +++ b/drivers/net/arm/at91_ether.c | |||
@@ -485,6 +485,7 @@ static void update_mac_address(struct net_device *dev) | |||
485 | static int set_mac_address(struct net_device *dev, void* addr) | 485 | static int set_mac_address(struct net_device *dev, void* addr) |
486 | { | 486 | { |
487 | struct sockaddr *address = addr; | 487 | struct sockaddr *address = addr; |
488 | DECLARE_MAC_BUF(mac); | ||
488 | 489 | ||
489 | if (!is_valid_ether_addr(address->sa_data)) | 490 | if (!is_valid_ether_addr(address->sa_data)) |
490 | return -EADDRNOTAVAIL; | 491 | return -EADDRNOTAVAIL; |
@@ -492,9 +493,8 @@ static int set_mac_address(struct net_device *dev, void* addr) | |||
492 | memcpy(dev->dev_addr, address->sa_data, dev->addr_len); | 493 | memcpy(dev->dev_addr, address->sa_data, dev->addr_len); |
493 | update_mac_address(dev); | 494 | update_mac_address(dev); |
494 | 495 | ||
495 | printk("%s: Setting MAC address to %02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, | 496 | printk("%s: Setting MAC address to %s\n", dev->name, |
496 | dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2], | 497 | print_mac(mac, dev->dev_addr)); |
497 | dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]); | ||
498 | 498 | ||
499 | return 0; | 499 | return 0; |
500 | } | 500 | } |
@@ -979,6 +979,7 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add | |||
979 | struct at91_private *lp; | 979 | struct at91_private *lp; |
980 | unsigned int val; | 980 | unsigned int val; |
981 | int res; | 981 | int res; |
982 | DECLARE_MAC_BUF(mac); | ||
982 | 983 | ||
983 | dev = alloc_etherdev(sizeof(struct at91_private)); | 984 | dev = alloc_etherdev(sizeof(struct at91_private)); |
984 | if (!dev) | 985 | if (!dev) |
@@ -1081,12 +1082,11 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add | |||
1081 | } | 1082 | } |
1082 | 1083 | ||
1083 | /* Display ethernet banner */ | 1084 | /* Display ethernet banner */ |
1084 | printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%02x:%02x:%02x:%02x:%02x:%02x)\n", | 1085 | printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%s)\n", |
1085 | dev->name, (uint) dev->base_addr, dev->irq, | 1086 | dev->name, (uint) dev->base_addr, dev->irq, |
1086 | at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_SPD ? "100-" : "10-", | 1087 | at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_SPD ? "100-" : "10-", |
1087 | at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_FD ? "FullDuplex" : "HalfDuplex", | 1088 | at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_FD ? "FullDuplex" : "HalfDuplex", |
1088 | dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2], | 1089 | print_mac(mac, dev->dev_addr)); |
1089 | dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]); | ||
1090 | if ((phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID)) | 1090 | if ((phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID)) |
1091 | printk(KERN_INFO "%s: Davicom 9161 PHY %s\n", dev->name, (lp->phy_media == PORT_FIBRE) ? "(Fiber)" : "(Copper)"); | 1091 | printk(KERN_INFO "%s: Davicom 9161 PHY %s\n", dev->name, (lp->phy_media == PORT_FIBRE) ? "(Fiber)" : "(Copper)"); |
1092 | else if (phy_type == MII_LXT971A_ID) | 1092 | else if (phy_type == MII_LXT971A_ID) |