aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c59x.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/3c59x.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/3c59x.c')
-rw-r--r--drivers/net/3c59x.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index ad0f6a729d29..58311199e321 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -1014,6 +1014,7 @@ static int __devinit vortex_probe1(struct device *gendev,
1014 char *print_name = "3c59x"; 1014 char *print_name = "3c59x";
1015 struct pci_dev *pdev = NULL; 1015 struct pci_dev *pdev = NULL;
1016 struct eisa_device *edev = NULL; 1016 struct eisa_device *edev = NULL;
1017 DECLARE_MAC_BUF(mac);
1017 1018
1018 if (!printed_version) { 1019 if (!printed_version) {
1019 printk (version); 1020 printk (version);
@@ -1205,10 +1206,8 @@ static int __devinit vortex_probe1(struct device *gendev,
1205 for (i = 0; i < 3; i++) 1206 for (i = 0; i < 3; i++)
1206 ((u16 *)dev->dev_addr)[i] = htons(eeprom[i + 10]); 1207 ((u16 *)dev->dev_addr)[i] = htons(eeprom[i + 10]);
1207 memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); 1208 memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
1208 if (print_info) { 1209 if (print_info)
1209 for (i = 0; i < 6; i++) 1210 printk(" %s", print_mac(mac, dev->dev_addr));
1210 printk("%c%2.2x", i ? ':' : ' ', dev->dev_addr[i]);
1211 }
1212 /* Unfortunately an all zero eeprom passes the checksum and this 1211 /* Unfortunately an all zero eeprom passes the checksum and this
1213 gets found in the wild in failure cases. Crypto is hard 8) */ 1212 gets found in the wild in failure cases. Crypto is hard 8) */
1214 if (!is_valid_ether_addr(dev->dev_addr)) { 1213 if (!is_valid_ether_addr(dev->dev_addr)) {