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/myri10ge/myri10ge.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/myri10ge/myri10ge.c')
-rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index b1556b2e404c..22e6292212f7 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c | |||
@@ -2981,7 +2981,6 @@ static void myri10ge_set_multicast_list(struct net_device *dev) | |||
2981 | struct dev_mc_list *mc_list; | 2981 | struct dev_mc_list *mc_list; |
2982 | __be32 data[2] = { 0, 0 }; | 2982 | __be32 data[2] = { 0, 0 }; |
2983 | int err; | 2983 | int err; |
2984 | DECLARE_MAC_BUF(mac); | ||
2985 | 2984 | ||
2986 | /* can be called from atomic contexts, | 2985 | /* can be called from atomic contexts, |
2987 | * pass 1 to force atomicity in myri10ge_send_cmd() */ | 2986 | * pass 1 to force atomicity in myri10ge_send_cmd() */ |
@@ -3028,8 +3027,7 @@ static void myri10ge_set_multicast_list(struct net_device *dev) | |||
3028 | printk(KERN_ERR "myri10ge: %s: Failed " | 3027 | printk(KERN_ERR "myri10ge: %s: Failed " |
3029 | "MXGEFW_JOIN_MULTICAST_GROUP, error status:" | 3028 | "MXGEFW_JOIN_MULTICAST_GROUP, error status:" |
3030 | "%d\t", dev->name, err); | 3029 | "%d\t", dev->name, err); |
3031 | printk(KERN_ERR "MAC %s\n", | 3030 | printk(KERN_ERR "MAC %pM\n", mc_list->dmi_addr); |
3032 | print_mac(mac, mc_list->dmi_addr)); | ||
3033 | goto abort; | 3031 | goto abort; |
3034 | } | 3032 | } |
3035 | } | 3033 | } |