diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-27 18:59:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-27 20:06:18 -0400 |
commit | e174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch) | |
tree | e8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/meth.c | |
parent | 0c68ae2605dbcf67414d8d1f19af93be44b355fb (diff) |
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>
Diffstat (limited to 'drivers/net/meth.c')
-rw-r--r-- | drivers/net/meth.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/meth.c b/drivers/net/meth.c index a1e22ed1f6ee..621133b45f8f 100644 --- a/drivers/net/meth.c +++ b/drivers/net/meth.c | |||
@@ -94,10 +94,9 @@ char o2meth_eaddr[8]={0,0,0,0,0,0,0,0}; | |||
94 | static inline void load_eaddr(struct net_device *dev) | 94 | static inline void load_eaddr(struct net_device *dev) |
95 | { | 95 | { |
96 | int i; | 96 | int i; |
97 | DECLARE_MAC_BUF(mac); | ||
98 | u64 macaddr; | 97 | u64 macaddr; |
99 | 98 | ||
100 | DPRINTK("Loading MAC Address: %s\n", print_mac(mac, dev->dev_addr)); | 99 | DPRINTK("Loading MAC Address: %pM\n", dev->dev_addr); |
101 | macaddr = 0; | 100 | macaddr = 0; |
102 | for (i = 0; i < 6; i++) | 101 | for (i = 0; i < 6; i++) |
103 | macaddr |= (u64)dev->dev_addr[i] << ((5 - i) * 8); | 102 | macaddr |= (u64)dev->dev_addr[i] << ((5 - i) * 8); |