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/ne.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/ne.c')
-rw-r--r-- | drivers/net/ne.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ne.c b/drivers/net/ne.c index 27d87985bb63..874d291cbaed 100644 --- a/drivers/net/ne.c +++ b/drivers/net/ne.c | |||
@@ -291,6 +291,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr) | |||
291 | int neX000, ctron, copam, bad_card; | 291 | int neX000, ctron, copam, bad_card; |
292 | int reg0, ret; | 292 | int reg0, ret; |
293 | static unsigned version_printed; | 293 | static unsigned version_printed; |
294 | DECLARE_MAC_BUF(mac); | ||
294 | 295 | ||
295 | if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME)) | 296 | if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME)) |
296 | return -EBUSY; | 297 | return -EBUSY; |
@@ -503,16 +504,14 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr) | |||
503 | for (i = 0 ; i < ETHER_ADDR_LEN ; i++) { | 504 | for (i = 0 ; i < ETHER_ADDR_LEN ; i++) { |
504 | dev->dev_addr[i] = SA_prom[i] | 505 | dev->dev_addr[i] = SA_prom[i] |
505 | = inb_p(ioaddr + EN1_PHYS_SHIFT(i)); | 506 | = inb_p(ioaddr + EN1_PHYS_SHIFT(i)); |
506 | printk(" %2.2x", SA_prom[i]); | ||
507 | } | 507 | } |
508 | #else | 508 | #else |
509 | for(i = 0; i < ETHER_ADDR_LEN; i++) { | 509 | for(i = 0; i < ETHER_ADDR_LEN; i++) { |
510 | printk(" %2.2x", SA_prom[i]); | ||
511 | dev->dev_addr[i] = SA_prom[i]; | 510 | dev->dev_addr[i] = SA_prom[i]; |
512 | } | 511 | } |
513 | #endif | 512 | #endif |
514 | 513 | ||
515 | printk("\n"); | 514 | printk("%s\n", print_mac(mac, dev->dev_addr)); |
516 | 515 | ||
517 | ei_status.name = name; | 516 | ei_status.name = name; |
518 | ei_status.tx_start_page = start_page; | 517 | ei_status.tx_start_page = start_page; |