net: convert print_mac to %pM
This converts pretty much everything to print_mac. There were a few things that had conflicts which I have just dropped for now, no harm done. I've built an allyesconfig with this and looked at the files that weren't built very carefully, but it's a huge patch. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
0c68ae2605
commit
e174961ca1
@@ -303,7 +303,6 @@ static int __init lance_probe( struct net_device *dev)
|
||||
static int did_version;
|
||||
volatile unsigned short *ioaddr_probe;
|
||||
unsigned short tmp1, tmp2;
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
#ifdef CONFIG_SUN3
|
||||
ioaddr = (unsigned long)ioremap(LANCE_OBIO, PAGE_SIZE);
|
||||
@@ -379,7 +378,7 @@ static int __init lance_probe( struct net_device *dev)
|
||||
MEM->init.hwaddr[4] = dev->dev_addr[5];
|
||||
MEM->init.hwaddr[5] = dev->dev_addr[4];
|
||||
|
||||
printk("%s\n", print_mac(mac, dev->dev_addr));
|
||||
printk("%pM\n", dev->dev_addr);
|
||||
|
||||
MEM->init.mode = 0x0000;
|
||||
MEM->init.filter[0] = 0x00000000;
|
||||
@@ -824,12 +823,10 @@ static int lance_rx( struct net_device *dev )
|
||||
#if 0
|
||||
if (lance_debug >= 3) {
|
||||
u_char *data = PKTBUF_ADDR(head);
|
||||
DECLARE_MAC_BUF(mac);
|
||||
DECLARE_MAC_BUF(mac2)
|
||||
printk("%s: RX pkt %d type 0x%04x"
|
||||
" from %s to %s",
|
||||
" from %pM to %pM",
|
||||
dev->name, lp->new_tx, ((u_short *)data)[6],
|
||||
print_mac(mac, &data[6]), print_mac(mac2, data));
|
||||
&data[6], data);
|
||||
|
||||
printk(" data %02x %02x %02x %02x %02x %02x %02x %02x "
|
||||
"len %d at %08x\n",
|
||||
|
Reference in New Issue
Block a user