diff options
Diffstat (limited to 'drivers/net/sun3lance.c')
-rw-r--r-- | drivers/net/sun3lance.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c index 359452a06c67..608aa2f789d1 100644 --- a/drivers/net/sun3lance.c +++ b/drivers/net/sun3lance.c | |||
@@ -303,7 +303,6 @@ static int __init lance_probe( struct net_device *dev) | |||
303 | static int did_version; | 303 | static int did_version; |
304 | volatile unsigned short *ioaddr_probe; | 304 | volatile unsigned short *ioaddr_probe; |
305 | unsigned short tmp1, tmp2; | 305 | unsigned short tmp1, tmp2; |
306 | DECLARE_MAC_BUF(mac); | ||
307 | 306 | ||
308 | #ifdef CONFIG_SUN3 | 307 | #ifdef CONFIG_SUN3 |
309 | ioaddr = (unsigned long)ioremap(LANCE_OBIO, PAGE_SIZE); | 308 | ioaddr = (unsigned long)ioremap(LANCE_OBIO, PAGE_SIZE); |
@@ -379,7 +378,7 @@ static int __init lance_probe( struct net_device *dev) | |||
379 | MEM->init.hwaddr[4] = dev->dev_addr[5]; | 378 | MEM->init.hwaddr[4] = dev->dev_addr[5]; |
380 | MEM->init.hwaddr[5] = dev->dev_addr[4]; | 379 | MEM->init.hwaddr[5] = dev->dev_addr[4]; |
381 | 380 | ||
382 | printk("%s\n", print_mac(mac, dev->dev_addr)); | 381 | printk("%pM\n", dev->dev_addr); |
383 | 382 | ||
384 | MEM->init.mode = 0x0000; | 383 | MEM->init.mode = 0x0000; |
385 | MEM->init.filter[0] = 0x00000000; | 384 | MEM->init.filter[0] = 0x00000000; |
@@ -824,12 +823,10 @@ static int lance_rx( struct net_device *dev ) | |||
824 | #if 0 | 823 | #if 0 |
825 | if (lance_debug >= 3) { | 824 | if (lance_debug >= 3) { |
826 | u_char *data = PKTBUF_ADDR(head); | 825 | u_char *data = PKTBUF_ADDR(head); |
827 | DECLARE_MAC_BUF(mac); | ||
828 | DECLARE_MAC_BUF(mac2) | ||
829 | printk("%s: RX pkt %d type 0x%04x" | 826 | printk("%s: RX pkt %d type 0x%04x" |
830 | " from %s to %s", | 827 | " from %pM to %pM", |
831 | dev->name, lp->new_tx, ((u_short *)data)[6], | 828 | dev->name, lp->new_tx, ((u_short *)data)[6], |
832 | print_mac(mac, &data[6]), print_mac(mac2, data)); | 829 | &data[6], data); |
833 | 830 | ||
834 | printk(" data %02x %02x %02x %02x %02x %02x %02x %02x " | 831 | printk(" data %02x %02x %02x %02x %02x %02x %02x %02x " |
835 | "len %d at %08x\n", | 832 | "len %d at %08x\n", |