aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c515.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/3c515.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/3c515.c')
-rw-r--r--drivers/net/3c515.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 38a2ebea9b45..275e7510ebaf 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -569,6 +569,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
569 unsigned int eeprom[0x40], checksum = 0; /* EEPROM contents */ 569 unsigned int eeprom[0x40], checksum = 0; /* EEPROM contents */
570 int i; 570 int i;
571 int irq; 571 int irq;
572 DECLARE_MAC_BUF(mac);
572 573
573 if (idev) { 574 if (idev) {
574 irq = pnp_irq(idev, 0); 575 irq = pnp_irq(idev, 0);
@@ -630,8 +631,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
630 checksum = (checksum ^ (checksum >> 8)) & 0xff; 631 checksum = (checksum ^ (checksum >> 8)) & 0xff;
631 if (checksum != 0x00) 632 if (checksum != 0x00)
632 printk(" ***INVALID CHECKSUM %4.4x*** ", checksum); 633 printk(" ***INVALID CHECKSUM %4.4x*** ", checksum);
633 for (i = 0; i < 6; i++) 634 printk(" %s", print_mac(mac, dev->dev_addr));
634 printk("%c%2.2x", i ? ':' : ' ', dev->dev_addr[i]);
635 if (eeprom[16] == 0x11c7) { /* Corkscrew */ 635 if (eeprom[16] == 0x11c7) { /* Corkscrew */
636 if (request_dma(dev->dma, "3c515")) { 636 if (request_dma(dev->dma, "3c515")) {
637 printk(", DMA %d allocation failed", dev->dma); 637 printk(", DMA %d allocation failed", dev->dma);