[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()

This is nicer than the MAC_FMT stuff.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 10 deletions

diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index 6b03416731de..bb30d5be7824 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -1116,15 +1116,12 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 static void print_eth(unsigned char *add, char *str)
 {
-        int i;
+        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mac2);
 
-        printk(KERN_DEBUG "i596 0x%p, ", add);
-        for (i = 0; i < 6; i++)
-                printk(" %02X", add[i + 6]);
-        printk(" -->");
-        for (i = 0; i < 6; i++)
-                printk(" %02X", add[i]);
-        printk(" %02X%02X, %s\n", add[12], add[13], str);
+        printk(KERN_DEBUG "i596 0x%p, %s --> %s %02X%02X, %s\n",
+               add, print_mac(mac, add + 6), print_mac(mac2, add),
+               add[12], add[13], str);
 }
 
 static int io = 0x300;
@@ -1539,6 +1536,7 @@ static void set_multicast_list(struct net_device *dev)
                 struct dev_mc_list *dmi;
                 unsigned char *cp;
                 struct mc_cmd *cmd;
+                DECLARE_MAC_BUF(mac);
 
                 if (wait_cfg(dev, &lp->mc_cmd.cmd, 1000, "multicast list change request timed out"))
                         return;
@@ -1549,8 +1547,8 @@ static void set_multicast_list(struct net_device *dev)
                 for (dmi = dev->mc_list; cnt && dmi != NULL; dmi = dmi->next, cnt--, cp += 6) {
                         memcpy(cp, dmi->dmi_addr, 6);
                         if (i596_debug > 1)
-                                DEB(DEB_MULTI,printk(KERN_INFO "%s: Adding address %02x:%02x:%02x:%02x:%02x:%02x\n",
-                                                dev->name, cp[0],cp[1],cp[2],cp[3],cp[4],cp[5]));
+                                DEB(DEB_MULTI,printk(KERN_INFO "%s: Adding address %s\n",
+                                                dev->name, print_mac(mac, cp)));
                 }
                 i596_add_cmd(dev, &cmd->cmd);
         }