[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>

2 files changed, 8 insertions, 21 deletions

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index bb7523a5b408..e13602d8154d 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -534,6 +534,7 @@ out:
 
 void netpoll_print_options(struct netpoll *np)
 {
+        DECLARE_MAC_BUF(mac);
         printk(KERN_INFO "%s: local port %d\n",
                          np->name, np->local_port);
         printk(KERN_INFO "%s: local IP %d.%d.%d.%d\n",
@@ -544,15 +545,8 @@ void netpoll_print_options(struct netpoll *np)
                          np->name, np->remote_port);
         printk(KERN_INFO "%s: remote IP %d.%d.%d.%d\n",
                          np->name, HIPQUAD(np->remote_ip));
-        printk(KERN_INFO "%s: remote ethernet address "
-                         "%02x:%02x:%02x:%02x:%02x:%02x\n",
-                         np->name,
-                         np->remote_mac[0],
-                         np->remote_mac[1],
-                         np->remote_mac[2],
-                         np->remote_mac[3],
-                         np->remote_mac[4],
-                         np->remote_mac[5]);
+        printk(KERN_INFO "%s: remote ethernet address %s\n",
+                         np->name, print_mac(mac, np->remote_mac));
 }
 
 int netpoll_parse_options(struct netpoll *np, char *opt)
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 94e42be16daa..f07bd590f8f9 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -599,11 +599,11 @@ static const struct file_operations pktgen_fops = {
 
 static int pktgen_if_show(struct seq_file *seq, void *v)
 {
-        int i;
         struct pktgen_dev *pkt_dev = seq->private;
         __u64 sa;
         __u64 stopped;
         __u64 now = getCurUs();
+        DECLARE_MAC_BUF(mac);
 
         seq_printf(seq,
                    "Params: count %llu  min_pkt_size: %u  max_pkt_size: %u\n",
@@ -648,19 +648,12 @@ static int pktgen_if_show(struct seq_file *seq, void *v)
 
         seq_puts(seq, "     src_mac: ");
 
-        if (is_zero_ether_addr(pkt_dev->src_mac))
-                for (i = 0; i < 6; i++)
-                        seq_printf(seq, "%02X%s", pkt_dev->odev->dev_addr[i],
-                                   i == 5 ? "  " : ":");
-        else
-                for (i = 0; i < 6; i++)
-                        seq_printf(seq, "%02X%s", pkt_dev->src_mac[i],
-                                   i == 5 ? "  " : ":");
+        seq_printf(seq, "%s ",
+                   print_mac(mac, is_zero_ether_addr(pkt_dev->src_mac) ?
+                             pkt_dev->odev->dev_addr : pkt_dev->src_mac));
 
         seq_printf(seq, "dst_mac: ");
-        for (i = 0; i < 6; i++)
-                seq_printf(seq, "%02X%s", pkt_dev->dst_mac[i],
-                           i == 5 ? "\n" : ":");
+        seq_printf(seq, "%s\n", print_mac(mac, pkt_dev->dst_mac));
 
         seq_printf(seq,
                    "     udp_src_min: %d  udp_src_max: %d  udp_dst_min: %d  udp_dst_max: %d\n",