diff options
author | Joe Perches <joe@perches.com> | 2007-10-03 20:59:30 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:51:42 -0400 |
commit | 0795af5729b18218767fab27c44b1384f72dc9ad (patch) | |
tree | 67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/lance.c | |
parent | 95ea36275f3c9a1d3d04c217b4b576c657c4e70e (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/lance.c')
-rw-r--r-- | drivers/net/lance.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/lance.c b/drivers/net/lance.c index 7b17212d687e..977ed3401bb3 100644 --- a/drivers/net/lance.c +++ b/drivers/net/lance.c | |||
@@ -466,6 +466,7 @@ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int | |||
466 | unsigned long flags; | 466 | unsigned long flags; |
467 | int err = -ENOMEM; | 467 | int err = -ENOMEM; |
468 | void __iomem *bios; | 468 | void __iomem *bios; |
469 | DECLARE_MAC_BUF(mac); | ||
469 | 470 | ||
470 | /* First we look for special cases. | 471 | /* First we look for special cases. |
471 | Check for HP's on-board ethernet by looking for 'HP' in the BIOS. | 472 | Check for HP's on-board ethernet by looking for 'HP' in the BIOS. |
@@ -522,12 +523,13 @@ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int | |||
522 | /* We can't allocate dev->priv from alloc_etherdev() because it must | 523 | /* We can't allocate dev->priv from alloc_etherdev() because it must |
523 | a ISA DMA-able region. */ | 524 | a ISA DMA-able region. */ |
524 | chipname = chip_table[lance_version].name; | 525 | chipname = chip_table[lance_version].name; |
525 | printk("%s: %s at %#3x,", dev->name, chipname, ioaddr); | 526 | printk("%s: %s at %#3x, ", dev->name, chipname, ioaddr); |
526 | 527 | ||
527 | /* There is a 16 byte station address PROM at the base address. | 528 | /* There is a 16 byte station address PROM at the base address. |
528 | The first six bytes are the station address. */ | 529 | The first six bytes are the station address. */ |
529 | for (i = 0; i < 6; i++) | 530 | for (i = 0; i < 6; i++) |
530 | printk(" %2.2x", dev->dev_addr[i] = inb(ioaddr + i)); | 531 | dev->dev_addr[i] = inb(ioaddr + i); |
532 | printk("%s", print_mac(mac, dev->dev_addr)); | ||
531 | 533 | ||
532 | dev->base_addr = ioaddr; | 534 | dev->base_addr = ioaddr; |
533 | /* Make certain the data structures used by the LANCE are aligned and DMAble. */ | 535 | /* Make certain the data structures used by the LANCE are aligned and DMAble. */ |