aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/acenic.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2007-10-03 20:59:30 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:51:42 -0400
commit0795af5729b18218767fab27c44b1384f72dc9ad (patch)
tree67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/acenic.c
parent95ea36275f3c9a1d3d04c217b4b576c657c4e70e (diff)
[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()
This is nicer than the MAC_FMT stuff. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/acenic.c')
-rw-r--r--drivers/net/acenic.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index ca00f41e4d85..2c2ed6dc98bc 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -893,6 +893,7 @@ static int __devinit ace_init(struct net_device *dev)
893 int board_idx, ecode = 0; 893 int board_idx, ecode = 0;
894 short i; 894 short i;
895 unsigned char cache_size; 895 unsigned char cache_size;
896 DECLARE_MAC_BUF(mac);
896 897
897 ap = netdev_priv(dev); 898 ap = netdev_priv(dev);
898 regs = ap->regs; 899 regs = ap->regs;
@@ -1012,10 +1013,6 @@ static int __devinit ace_init(struct net_device *dev)
1012 writel(mac1, &regs->MacAddrHi); 1013 writel(mac1, &regs->MacAddrHi);
1013 writel(mac2, &regs->MacAddrLo); 1014 writel(mac2, &regs->MacAddrLo);
1014 1015
1015 printk("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
1016 (mac1 >> 8) & 0xff, mac1 & 0xff, (mac2 >> 24) &0xff,
1017 (mac2 >> 16) & 0xff, (mac2 >> 8) & 0xff, mac2 & 0xff);
1018
1019 dev->dev_addr[0] = (mac1 >> 8) & 0xff; 1016 dev->dev_addr[0] = (mac1 >> 8) & 0xff;
1020 dev->dev_addr[1] = mac1 & 0xff; 1017 dev->dev_addr[1] = mac1 & 0xff;
1021 dev->dev_addr[2] = (mac2 >> 24) & 0xff; 1018 dev->dev_addr[2] = (mac2 >> 24) & 0xff;
@@ -1023,6 +1020,8 @@ static int __devinit ace_init(struct net_device *dev)
1023 dev->dev_addr[4] = (mac2 >> 8) & 0xff; 1020 dev->dev_addr[4] = (mac2 >> 8) & 0xff;
1024 dev->dev_addr[5] = mac2 & 0xff; 1021 dev->dev_addr[5] = mac2 & 0xff;
1025 1022
1023 printk("MAC: %s\n", print_mac(mac, dev->dev_addr));
1024
1026 /* 1025 /*
1027 * Looks like this is necessary to deal with on all architectures, 1026 * Looks like this is necessary to deal with on all architectures,
1028 * even this %$#%$# N440BX Intel based thing doesn't get it right. 1027 * even this %$#%$# N440BX Intel based thing doesn't get it right.