aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/pcnet_cs.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/pcmcia/pcnet_cs.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/pcmcia/pcnet_cs.c')
-rw-r--r--drivers/net/pcmcia/pcnet_cs.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 8ce251cd3209..6a647516c380 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -38,7 +38,7 @@
38#include <linux/delay.h> 38#include <linux/delay.h>
39#include <linux/ethtool.h> 39#include <linux/ethtool.h>
40#include <linux/netdevice.h> 40#include <linux/netdevice.h>
41#include <../drivers/net/8390.h> 41#include "../8390.h"
42 42
43#include <pcmcia/cs_types.h> 43#include <pcmcia/cs_types.h>
44#include <pcmcia/cs.h> 44#include <pcmcia/cs.h>
@@ -521,6 +521,7 @@ static int pcnet_config(struct pcmcia_device *link)
521 int has_shmem = 0; 521 int has_shmem = 0;
522 u_short buf[64]; 522 u_short buf[64];
523 hw_info_t *hw_info; 523 hw_info_t *hw_info;
524 DECLARE_MAC_BUF(mac);
524 525
525 DEBUG(0, "pcnet_config(0x%p)\n", link); 526 DEBUG(0, "pcnet_config(0x%p)\n", link);
526 527
@@ -670,9 +671,7 @@ static int pcnet_config(struct pcmcia_device *link)
670 printk (" mem %#5lx,", dev->mem_start); 671 printk (" mem %#5lx,", dev->mem_start);
671 if (info->flags & HAS_MISC_REG) 672 if (info->flags & HAS_MISC_REG)
672 printk(" %s xcvr,", if_names[dev->if_port]); 673 printk(" %s xcvr,", if_names[dev->if_port]);
673 printk(" hw_addr "); 674 printk(" hw_addr %s\n", print_mac(mac, dev->dev_addr));
674 for (i = 0; i < 6; i++)
675 printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : "\n"));
676 return 0; 675 return 0;
677 676
678cs_failed: 677cs_failed: