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/82596.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/82596.c')
-rw-r--r-- | drivers/net/82596.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index da292e647eb..1d97bb5377a 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c | |||
@@ -1116,12 +1116,8 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1116 | 1116 | ||
1117 | static void print_eth(unsigned char *add, char *str) | 1117 | static void print_eth(unsigned char *add, char *str) |
1118 | { | 1118 | { |
1119 | DECLARE_MAC_BUF(mac); | 1119 | printk(KERN_DEBUG "i596 0x%p, %pM --> %pM %02X%02X, %s\n", |
1120 | DECLARE_MAC_BUF(mac2); | 1120 | add, add + 6, add, add[12], add[13], str); |
1121 | |||
1122 | printk(KERN_DEBUG "i596 0x%p, %s --> %s %02X%02X, %s\n", | ||
1123 | add, print_mac(mac, add + 6), print_mac(mac2, add), | ||
1124 | add[12], add[13], str); | ||
1125 | } | 1121 | } |
1126 | 1122 | ||
1127 | static int io = 0x300; | 1123 | static int io = 0x300; |
@@ -1544,7 +1540,6 @@ static void set_multicast_list(struct net_device *dev) | |||
1544 | struct dev_mc_list *dmi; | 1540 | struct dev_mc_list *dmi; |
1545 | unsigned char *cp; | 1541 | unsigned char *cp; |
1546 | struct mc_cmd *cmd; | 1542 | struct mc_cmd *cmd; |
1547 | DECLARE_MAC_BUF(mac); | ||
1548 | 1543 | ||
1549 | if (wait_cfg(dev, &lp->mc_cmd.cmd, 1000, "multicast list change request timed out")) | 1544 | if (wait_cfg(dev, &lp->mc_cmd.cmd, 1000, "multicast list change request timed out")) |
1550 | return; | 1545 | return; |
@@ -1555,8 +1550,8 @@ static void set_multicast_list(struct net_device *dev) | |||
1555 | for (dmi = dev->mc_list; cnt && dmi != NULL; dmi = dmi->next, cnt--, cp += 6) { | 1550 | for (dmi = dev->mc_list; cnt && dmi != NULL; dmi = dmi->next, cnt--, cp += 6) { |
1556 | memcpy(cp, dmi->dmi_addr, 6); | 1551 | memcpy(cp, dmi->dmi_addr, 6); |
1557 | if (i596_debug > 1) | 1552 | if (i596_debug > 1) |
1558 | DEB(DEB_MULTI,printk(KERN_INFO "%s: Adding address %s\n", | 1553 | DEB(DEB_MULTI,printk(KERN_INFO "%s: Adding address %pM\n", |
1559 | dev->name, print_mac(mac, cp))); | 1554 | dev->name, cp)); |
1560 | } | 1555 | } |
1561 | i596_add_cmd(dev, &cmd->cmd); | 1556 | i596_add_cmd(dev, &cmd->cmd); |
1562 | } | 1557 | } |