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>

13 files changed, 67 insertions, 131 deletions

diff --git a/net/802/tr.c b/net/802/tr.c
index 18c66475d8c3..38f1f290c635 100644
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -285,10 +285,7 @@ void tr_source_route(struct sk_buff *skb,struct trh_hdr *trh,
                 if(entry)
                 {
 #if TR_SR_DEBUG
-{
-DECLARE_MAC_BUF(mac);
-printk("source routing for %s\n",print_mac(mac, trh->daddr));
-}
+printk("source routing for %pM\n", trh->daddr);
 #endif
                         if(!entry->local_ring && (ntohs(entry->rcf) & TR_RCF_LEN_MASK) >> 8)
                         {
@@ -370,9 +367,8 @@ static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev)
         if(entry==NULL)
         {
 #if TR_SR_DEBUG
-                DECLARE_MAC_BUF(mac);
-                printk("adding rif_entry: addr:%s rcf:%04X\n",
-                       print_mac(mac, trh->saddr), ntohs(trh->rcf));
+                printk("adding rif_entry: addr:%pM rcf:%04X\n",
+                       trh->saddr, ntohs(trh->rcf));
 #endif
                 /*
                  *      Allocate our new entry. A failure to allocate loses
@@ -417,11 +413,8 @@ static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev)
                          !(trh->rcf & htons(TR_RCF_BROADCAST_MASK)))
                     {
 #if TR_SR_DEBUG
-{
-DECLARE_MAC_BUF(mac);
-printk("updating rif_entry: addr:%s rcf:%04X\n",
-                print_mac(mac, trh->saddr), ntohs(trh->rcf));
-}
+printk("updating rif_entry: addr:%pM rcf:%04X\n",
+                trh->saddr, ntohs(trh->rcf));
 #endif
                             entry->rcf = trh->rcf & htons((unsigned short)~TR_RCF_BROADCAST_MASK);
                             memcpy(&(entry->rseg[0]),&(trh->rseg[0]),8*sizeof(unsigned short));
@@ -532,7 +525,6 @@ static int rif_seq_show(struct seq_file *seq, void *v)
 {
         int j, rcf_len, segment, brdgnmb;
         struct rif_cache *entry = v;
-        DECLARE_MAC_BUF(mac);
 
         if (v == SEQ_START_TOKEN)
                 seq_puts(seq,
@@ -542,9 +534,9 @@ static int rif_seq_show(struct seq_file *seq, void *v)
                 long ttl = (long) (entry->last_used + sysctl_tr_rif_timeout)
                                 - (long) jiffies;
 
-                seq_printf(seq, "%s %s %7li ",
+                seq_printf(seq, "%s %pM %7li ",
                            dev?dev->name:"?",
-                           print_mac(mac, entry->addr),
+                           entry->addr,
                            ttl/HZ);
 
                         if (entry->local_ring)
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
index b25c1e909d14..b03ff58e9308 100644
--- a/net/appletalk/aarp.c
+++ b/net/appletalk/aarp.c
@@ -995,7 +995,6 @@ static int aarp_seq_show(struct seq_file *seq, void *v)
         struct aarp_iter_state *iter = seq->private;
         struct aarp_entry *entry = v;
         unsigned long now = jiffies;
-        DECLARE_MAC_BUF(mac);
 
         if (v == SEQ_START_TOKEN)
                 seq_puts(seq,
@@ -1006,7 +1005,7 @@ static int aarp_seq_show(struct seq_file *seq, void *v)
                            ntohs(entry->target_addr.s_net),
                            (unsigned int) entry->target_addr.s_node,
                            entry->dev ? entry->dev->name : "????");
-                seq_printf(seq, "%s", print_mac(mac, entry->hwaddr));
+                seq_printf(seq, "%pM", entry->hwaddr);
                 seq_printf(seq, " %8s",
                            dt2str((long)entry->expires_at - (long)now));
                 if (iter->table == unresolved)
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 280de481edc7..29ef8dc6921b 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -698,12 +698,11 @@ static int br2684_seq_show(struct seq_file *seq, void *v)
                                                     br2684_devs);
         const struct net_device *net_dev = brdev->net_dev;
         const struct br2684_vcc *brvcc;
-        DECLARE_MAC_BUF(mac);
 
-        seq_printf(seq, "dev %.16s: num=%d, mac=%s (%s)\n",
+        seq_printf(seq, "dev %.16s: num=%d, mac=%pM (%s)\n",
                    net_dev->name,
                    brdev->number,
-                   print_mac(mac, net_dev->dev_addr),
+                   net_dev->dev_addr,
                    brdev->mac_was_set ? "set" : "auto");
 
         list_for_each_entry(brvcc, &brdev->brvccs, brvccs) {
diff --git a/net/atm/lec.c b/net/atm/lec.c
index 8f701cde5945..1def62d17739 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -373,19 +373,13 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 if (entry && (entry->tx_wait.qlen < LEC_UNRES_QUE_LEN)) {
                         pr_debug("%s:lec_start_xmit: queuing packet, ",
                                 dev->name);
-                        pr_debug("MAC address " MAC_FMT "\n",
-                                 lec_h->h_dest[0], lec_h->h_dest[1],
-                                 lec_h->h_dest[2], lec_h->h_dest[3],
-                                 lec_h->h_dest[4], lec_h->h_dest[5]);
+                        pr_debug("MAC address %pM\n", lec_h->h_dest);
                         skb_queue_tail(&entry->tx_wait, skb);
                 } else {
                         pr_debug
                             ("%s:lec_start_xmit: tx queue full or no arp entry, dropping, ",
                              dev->name);
-                        pr_debug("MAC address " MAC_FMT "\n",
-                                 lec_h->h_dest[0], lec_h->h_dest[1],
-                                 lec_h->h_dest[2], lec_h->h_dest[3],
-                                 lec_h->h_dest[4], lec_h->h_dest[5]);
+                        pr_debug("MAC address %pM\n", lec_h->h_dest);
                         priv->stats.tx_dropped++;
                         dev_kfree_skb(skb);
                 }
@@ -397,10 +391,7 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         while (entry && (skb2 = skb_dequeue(&entry->tx_wait))) {
                 pr_debug("lec.c: emptying tx queue, ");
-                pr_debug("MAC address " MAC_FMT "\n",
-                         lec_h->h_dest[0], lec_h->h_dest[1],
-                         lec_h->h_dest[2], lec_h->h_dest[3],
-                         lec_h->h_dest[4], lec_h->h_dest[5]);
+                pr_debug("MAC address %pM\n", lec_h->h_dest);
                 lec_send(vcc, skb2, priv);
         }
 
@@ -539,15 +530,8 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
                 {
                         struct net_bridge_fdb_entry *f;
 
-                        pr_debug
-                            ("%s: bridge zeppelin asks about " MAC_FMT "\n",
-                             dev->name,
-                             mesg->content.proxy.mac_addr[0],
-                             mesg->content.proxy.mac_addr[1],
-                             mesg->content.proxy.mac_addr[2],
-                             mesg->content.proxy.mac_addr[3],
-                             mesg->content.proxy.mac_addr[4],
-                             mesg->content.proxy.mac_addr[5]);
+                        pr_debug("%s: bridge zeppelin asks about %pM\n",
+                                 dev->name, mesg->content.proxy.mac_addr);
 
                         if (br_fdb_get_hook == NULL || dev->br_port == NULL)
                                 break;
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 6c7af390be0a..34f5d072f168 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -553,7 +553,6 @@ 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",
@@ -564,8 +563,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 %s\n",
-                         np->name, print_mac(mac, np->remote_mac));
+        printk(KERN_INFO "%s: remote ethernet address %pM\n",
+                         np->name, 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 99f656d35b4f..18dd83c2ead0 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -509,7 +509,6 @@ static int pktgen_if_show(struct seq_file *seq, void *v)
         __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",
@@ -554,12 +553,12 @@ static int pktgen_if_show(struct seq_file *seq, void *v)
 
         seq_puts(seq, "     src_mac: ");
 
-        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, "%pM ",
+                   is_zero_ether_addr(pkt_dev->src_mac) ?
+                             pkt_dev->odev->dev_addr : pkt_dev->src_mac);
 
         seq_printf(seq, "dst_mac: ");
-        seq_printf(seq, "%s\n", print_mac(mac, pkt_dev->dst_mac));
+        seq_printf(seq, "%pM\n", pkt_dev->dst_mac);
 
         seq_printf(seq,
                    "     udp_src_min: %d  udp_src_max: %d  udp_dst_min: %d  udp_dst_max: %d\n",
diff --git a/net/ieee80211/ieee80211_crypt_ccmp.c b/net/ieee80211/ieee80211_crypt_ccmp.c
index 208bf35b5546..bea04af0b482 100644
--- a/net/ieee80211/ieee80211_crypt_ccmp.c
+++ b/net/ieee80211/ieee80211_crypt_ccmp.c
@@ -296,7 +296,6 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         int i, blocks, last, len;
         size_t data_len = skb->len - hdr_len - CCMP_HDR_LEN - CCMP_MIC_LEN;
         u8 *mic = skb->data + skb->len - CCMP_MIC_LEN;
-        DECLARE_MAC_BUF(mac);
 
         if (skb->len < hdr_len + CCMP_HDR_LEN + CCMP_MIC_LEN) {
                 key->dot11RSNAStatsCCMPFormatErrors++;
@@ -309,7 +308,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         if (!(keyidx & (1 << 5))) {
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG "CCMP: received packet without ExtIV"
-                               " flag from %s\n", print_mac(mac, hdr->addr2));
+                               " flag from %pM\n", hdr->addr2);
                 }
                 key->dot11RSNAStatsCCMPFormatErrors++;
                 return -2;
@@ -322,9 +321,9 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         }
         if (!key->key_set) {
                 if (net_ratelimit()) {
-                        printk(KERN_DEBUG "CCMP: received packet from %s"
+                        printk(KERN_DEBUG "CCMP: received packet from %pM"
                                " with keyid=%d that does not have a configured"
-                               " key\n", print_mac(mac, hdr->addr2), keyidx);
+                               " key\n", hdr->addr2, keyidx);
                 }
                 return -3;
         }
@@ -339,10 +338,10 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
 
         if (ccmp_replay_check(pn, key->rx_pn)) {
                 if (ieee80211_ratelimit_debug(IEEE80211_DL_DROP)) {
-                        IEEE80211_DEBUG_DROP("CCMP: replay detected: STA=%s "
+                        IEEE80211_DEBUG_DROP("CCMP: replay detected: STA=%pM "
                                  "previous PN %02x%02x%02x%02x%02x%02x "
                                  "received PN %02x%02x%02x%02x%02x%02x\n",
-                                 print_mac(mac, hdr->addr2),
+                                 hdr->addr2,
                                  key->rx_pn[0], key->rx_pn[1], key->rx_pn[2],
                                  key->rx_pn[3], key->rx_pn[4], key->rx_pn[5],
                                  pn[0], pn[1], pn[2], pn[3], pn[4], pn[5]);
@@ -373,7 +372,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         if (memcmp(mic, a, CCMP_MIC_LEN) != 0) {
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG "CCMP: decrypt failed: STA="
-                               "%s\n", print_mac(mac, hdr->addr2));
+                               "%pM\n", hdr->addr2);
                 }
                 key->dot11RSNAStatsCCMPDecryptErrors++;
                 return -5;
diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c
index bba0152e2d71..d12da1da6328 100644
--- a/net/ieee80211/ieee80211_crypt_tkip.c
+++ b/net/ieee80211/ieee80211_crypt_tkip.c
@@ -359,15 +359,13 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
         u8 rc4key[16], *pos, *icv;
         u32 crc;
         struct scatterlist sg;
-        DECLARE_MAC_BUF(mac);
 
         if (tkey->flags & IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) {
                 if (net_ratelimit()) {
                         struct ieee80211_hdr_4addr *hdr =
                             (struct ieee80211_hdr_4addr *)skb->data;
                         printk(KERN_DEBUG ": TKIP countermeasures: dropped "
-                               "TX packet to %s\n",
-                               print_mac(mac, hdr->addr1));
+                               "TX packet to %pM\n", hdr->addr1);
                 }
                 return -1;
         }
@@ -420,15 +418,13 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         u32 crc;
         struct scatterlist sg;
         int plen;
-        DECLARE_MAC_BUF(mac);
 
         hdr = (struct ieee80211_hdr_4addr *)skb->data;
 
         if (tkey->flags & IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) {
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG ": TKIP countermeasures: dropped "
-                               "received packet from %s\n",
-                               print_mac(mac, hdr->addr2));
+                               "received packet from %pM\n", hdr->addr2);
                 }
                 return -1;
         }
@@ -441,7 +437,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         if (!(keyidx & (1 << 5))) {
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG "TKIP: received packet without ExtIV"
-                               " flag from %s\n", print_mac(mac, hdr->addr2));
+                               " flag from %pM\n", hdr->addr2);
                 }
                 return -2;
         }
@@ -453,9 +449,9 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         }
         if (!tkey->key_set) {
                 if (net_ratelimit()) {
-                        printk(KERN_DEBUG "TKIP: received packet from %s"
+                        printk(KERN_DEBUG "TKIP: received packet from %pM"
                                " with keyid=%d that does not have a configured"
-                               " key\n", print_mac(mac, hdr->addr2), keyidx);
+                               " key\n", hdr->addr2, keyidx);
                 }
                 return -3;
         }
@@ -465,9 +461,9 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
 
         if (tkip_replay_check(iv32, iv16, tkey->rx_iv32, tkey->rx_iv16)) {
                 if (ieee80211_ratelimit_debug(IEEE80211_DL_DROP)) {
-                        IEEE80211_DEBUG_DROP("TKIP: replay detected: STA=%s"
+                        IEEE80211_DEBUG_DROP("TKIP: replay detected: STA=%pM"
                                " previous TSC %08x%04x received TSC "
-                               "%08x%04x\n", print_mac(mac, hdr->addr2),
+                               "%08x%04x\n", hdr->addr2,
                                tkey->rx_iv32, tkey->rx_iv16, iv32, iv16);
                 }
                 tkey->dot11RSNAStatsTKIPReplays++;
@@ -487,8 +483,8 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4)) {
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG ": TKIP: failed to decrypt "
-                               "received packet from %s\n",
-                               print_mac(mac, hdr->addr2));
+                               "received packet from %pM\n",
+                               hdr->addr2);
                 }
                 return -7;
         }
@@ -506,7 +502,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
                 }
                 if (ieee80211_ratelimit_debug(IEEE80211_DL_DROP)) {
                         IEEE80211_DEBUG_DROP("TKIP: ICV error detected: STA="
-                               "%s\n", print_mac(mac, hdr->addr2));
+                               "%pM\n", hdr->addr2);
                 }
                 tkey->dot11RSNAStatsTKIPICVErrors++;
                 return -5;
@@ -633,7 +629,6 @@ static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
 {
         struct ieee80211_tkip_data *tkey = priv;
         u8 mic[8];
-        DECLARE_MAC_BUF(mac);
 
         if (!tkey->key_set)
                 return -1;
@@ -646,8 +641,8 @@ static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
                 struct ieee80211_hdr_4addr *hdr;
                 hdr = (struct ieee80211_hdr_4addr *)skb->data;
                 printk(KERN_DEBUG "%s: Michael MIC verification failed for "
-                       "MSDU from %s keyidx=%d\n",
-                       skb->dev ? skb->dev->name : "N/A", print_mac(mac, hdr->addr2),
+                       "MSDU from %pM keyidx=%d\n",
+                       skb->dev ? skb->dev->name : "N/A", hdr->addr2,
                        keyidx);
                 if (skb->dev)
                         ieee80211_michael_mic_failure(skb->dev, hdr, keyidx);
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 69dbc342a464..281223e41c58 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -282,12 +282,8 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb,
         res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv);
         atomic_dec(&crypt->refcnt);
         if (res < 0) {
-                IEEE80211_DEBUG_DROP("decryption failed (SA=" MAC_FMT
-                                     ") res=%d\n",
-                                     hdr->addr2[0], hdr->addr2[1],
-                                     hdr->addr2[2], hdr->addr2[3],
-                                     hdr->addr2[4], hdr->addr2[5],
-                                     res);
+                IEEE80211_DEBUG_DROP("decryption failed (SA=%pM) res=%d\n",
+                                     hdr->addr2, res);
                 if (res == -2)
                         IEEE80211_DEBUG_DROP("Decryption failed ICV "
                                              "mismatch (key %d)\n",
@@ -319,11 +315,7 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee,
         atomic_dec(&crypt->refcnt);
         if (res < 0) {
                 printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed"
-                       " (SA=" MAC_FMT " keyidx=%d)\n",
-                       ieee->dev->name,
-                       hdr->addr2[0], hdr->addr2[1],
-                       hdr->addr2[2], hdr->addr2[3],
-                       hdr->addr2[4], hdr->addr2[5],
+                       " (SA=%pM keyidx=%d)\n", ieee->dev->name, hdr->addr2,
                        keyidx);
                 return -1;
         }
@@ -358,7 +350,6 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
         struct ieee80211_crypt_data *crypt = NULL;
         int keyidx = 0;
         int can_be_decrypted = 0;
-        DECLARE_MAC_BUF(mac);
 
         hdr = (struct ieee80211_hdr_4addr *)skb->data;
         stats = &ieee->stats;
@@ -468,10 +459,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
                          * frames silently instead of filling system log with
                          * these reports. */
                         IEEE80211_DEBUG_DROP("Decryption failed (not set)"
-                                             " (SA=" MAC_FMT ")\n",
-                                             hdr->addr2[0], hdr->addr2[1],
-                                             hdr->addr2[2], hdr->addr2[3],
-                                             hdr->addr2[4], hdr->addr2[5]);
+                                             " (SA=%pM)\n", hdr->addr2);
                         ieee->ieee_stats.rx_discards_undecryptable++;
                         goto rx_dropped;
                 }
@@ -482,10 +470,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
                     fc & IEEE80211_FCTL_PROTECTED && ieee->host_decrypt &&
                     (keyidx = hostap_rx_frame_decrypt(ieee, skb, crypt)) < 0) {
                         printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth "
-                               "from " MAC_FMT "\n", dev->name,
-                               hdr->addr2[0], hdr->addr2[1],
-                               hdr->addr2[2], hdr->addr2[3],
-                               hdr->addr2[4], hdr->addr2[5]);
+                               "from %pM\n", dev->name, hdr->addr2);
                         /* TODO: could inform hostapd about this so that it
                          * could send auth failure report */
                         goto rx_dropped;
@@ -663,11 +648,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
                          * configured */
                 } else {
                         IEEE80211_DEBUG_DROP("encryption configured, but RX "
-                                             "frame not encrypted (SA="
-                                             MAC_FMT ")\n",
-                                             hdr->addr2[0], hdr->addr2[1],
-                                             hdr->addr2[2], hdr->addr2[3],
-                                             hdr->addr2[4], hdr->addr2[5]);
+                                             "frame not encrypted (SA=%pM)\n",
+                                             hdr->addr2);
                         goto rx_dropped;
                 }
         }
@@ -675,11 +657,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
         if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !ieee->open_wep &&
             !ieee80211_is_eapol_frame(ieee, skb)) {
                 IEEE80211_DEBUG_DROP("dropped unencrypted RX data "
-                                     "frame from " MAC_FMT
-                                     " (drop_unencrypted=1)\n",
-                                     hdr->addr2[0], hdr->addr2[1],
-                                     hdr->addr2[2], hdr->addr2[3],
-                                     hdr->addr2[4], hdr->addr2[5]);
+                                     "frame from %pM (drop_unencrypted=1)\n",
+                                     hdr->addr2);
                 goto rx_dropped;
         }
 
@@ -1429,8 +1408,6 @@ static int ieee80211_network_init(struct ieee80211_device *ieee, struct ieee8021
                                          struct ieee80211_network *network,
                                          struct ieee80211_rx_stats *stats)
 {
-        DECLARE_MAC_BUF(mac);
-
         network->qos_data.active = 0;
         network->qos_data.supported = 0;
         network->qos_data.param_count = 0;
@@ -1477,11 +1454,11 @@ static int ieee80211_network_init(struct ieee80211_device *ieee, struct ieee8021
         }
 
         if (network->mode == 0) {
-                IEEE80211_DEBUG_SCAN("Filtered out '%s (%s)' "
+                IEEE80211_DEBUG_SCAN("Filtered out '%s (%pM)' "
                                      "network.\n",
                                      escape_essid(network->ssid,
                                                   network->ssid_len),
-                                     print_mac(mac, network->bssid));
+                                     network->bssid);
                 return 1;
         }
 
@@ -1510,7 +1487,6 @@ static void update_network(struct ieee80211_network *dst,
 {
         int qos_active;
         u8 old_param;
-        DECLARE_MAC_BUF(mac);
 
         ieee80211_network_reset(dst);
         dst->ibss_dfs = src->ibss_dfs;
@@ -1524,8 +1500,8 @@ static void update_network(struct ieee80211_network *dst,
                 memcpy(&dst->stats, &src->stats,
                        sizeof(struct ieee80211_rx_stats));
         else
-                IEEE80211_DEBUG_SCAN("Network %s info received "
-                        "off channel (%d vs. %d)\n", print_mac(mac, src->bssid),
+                IEEE80211_DEBUG_SCAN("Network %pM info received "
+                        "off channel (%d vs. %d)\n", src->bssid,
                         dst->channel, src->stats.received_channel);
 
         dst->capability = src->capability;
@@ -1597,12 +1573,11 @@ static void ieee80211_process_probe_response(struct ieee80211_device
         struct ieee80211_info_element *info_element = beacon->info_element;
 #endif
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
-        IEEE80211_DEBUG_SCAN("'%s' (%s"
+        IEEE80211_DEBUG_SCAN("'%s' (%pM"
                      "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
                      escape_essid(info_element->data, info_element->len),
-                     print_mac(mac, beacon->header.addr3),
+                     beacon->header.addr3,
                      (beacon->capability & cpu_to_le16(1 << 0xf)) ? '1' : '0',
                      (beacon->capability & cpu_to_le16(1 << 0xe)) ? '1' : '0',
                      (beacon->capability & cpu_to_le16(1 << 0xd)) ? '1' : '0',
@@ -1621,10 +1596,10 @@ static void ieee80211_process_probe_response(struct ieee80211_device
                      (beacon->capability & cpu_to_le16(1 << 0x0)) ? '1' : '0');
 
         if (ieee80211_network_init(ieee, beacon, &network, stats)) {
-                IEEE80211_DEBUG_SCAN("Dropped '%s' (%s) via %s.\n",
+                IEEE80211_DEBUG_SCAN("Dropped '%s' (%pM) via %s.\n",
                                      escape_essid(info_element->data,
                                                   info_element->len),
-                                     print_mac(mac, beacon->header.addr3),
+                                     beacon->header.addr3,
                                      is_beacon(beacon->header.frame_ctl) ?
                                      "BEACON" : "PROBE RESPONSE");
                 return;
@@ -1658,11 +1633,11 @@ static void ieee80211_process_probe_response(struct ieee80211_device
                         /* If there are no more slots, expire the oldest */
                         list_del(&oldest->list);
                         target = oldest;
-                        IEEE80211_DEBUG_SCAN("Expired '%s' (%s) from "
+                        IEEE80211_DEBUG_SCAN("Expired '%s' (%pM) from "
                                              "network list.\n",
                                              escape_essid(target->ssid,
                                                           target->ssid_len),
-                                             print_mac(mac, target->bssid));
+                                             target->bssid);
                         ieee80211_network_reset(target);
                 } else {
                         /* Otherwise just pull from the free list */
@@ -1672,10 +1647,10 @@ static void ieee80211_process_probe_response(struct ieee80211_device
                 }
 
 #ifdef CONFIG_IEEE80211_DEBUG
-                IEEE80211_DEBUG_SCAN("Adding '%s' (%s) via %s.\n",
+                IEEE80211_DEBUG_SCAN("Adding '%s' (%pM) via %s.\n",
                                      escape_essid(network.ssid,
                                                   network.ssid_len),
-                                     print_mac(mac, network.bssid),
+                                     network.bssid,
                                      is_beacon(beacon->header.frame_ctl) ?
                                      "BEACON" : "PROBE RESPONSE");
 #endif
@@ -1683,10 +1658,10 @@ static void ieee80211_process_probe_response(struct ieee80211_device
                 network.ibss_dfs = NULL;
                 list_add_tail(&target->list, &ieee->network_list);
         } else {
-                IEEE80211_DEBUG_SCAN("Updating '%s' (%s) via %s.\n",
+                IEEE80211_DEBUG_SCAN("Updating '%s' (%pM) via %s.\n",
                                      escape_essid(target->ssid,
                                                   target->ssid_len),
-                                     print_mac(mac, target->bssid),
+                                     target->bssid,
                                      is_beacon(beacon->header.frame_ctl) ?
                                      "BEACON" : "PROBE RESPONSE");
                 update_network(target, &network);
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index 973832dd7faf..89a81062ab4b 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -264,7 +264,6 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
         char *ev = extra;
         char *stop = ev + wrqu->data.length;
         int i = 0;
-        DECLARE_MAC_BUF(mac);
 
         IEEE80211_DEBUG_WX("Getting scan\n");
 
@@ -283,10 +282,10 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
                                                       info);
                 else
                         IEEE80211_DEBUG_SCAN("Not showing network '%s ("
-                                             "%s)' due to age (%dms).\n",
+                                             "%pM)' due to age (%dms).\n",
                                              escape_essid(network->ssid,
                                                           network->ssid_len),
-                                             print_mac(mac, network->bssid),
+                                             network->bssid,
                                              jiffies_to_msecs(jiffies -
                                                               network->
                                                               last_scanned));
diff --git a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c
index 6be1ec26b30c..42f7d960d055 100644
--- a/net/irda/irlan/irlan_client.c
+++ b/net/irda/irlan/irlan_client.c
@@ -436,7 +436,6 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
         __u16 tmp_cpu; /* Temporary value in host order */
         __u8 *bytes;
         int i;
-        DECLARE_MAC_BUF(mac);
 
         IRDA_DEBUG(4, "%s(), parm=%s\n", __func__ , param);
 
@@ -521,8 +520,7 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
         /* FILTER_ENTRY, have we got an ethernet address? */
         if (strcmp(param, "FILTER_ENTRY") == 0) {
                 bytes = value;
-                IRDA_DEBUG(4, "Ethernet address = %s\n",
-                           print_mac(mac, bytes));
+                IRDA_DEBUG(4, "Ethernet address = %pM\n", bytes);
                 for (i = 0; i < 6; i++)
                         self->dev->dev_addr[i] = bytes[i];
         }
diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
index 48212c0a961c..b58bd7c6cdf8 100644
--- a/net/llc/llc_proc.c
+++ b/net/llc/llc_proc.c
@@ -27,8 +27,7 @@
 
 static void llc_ui_format_mac(struct seq_file *seq, u8 *addr)
 {
-        DECLARE_MAC_BUF(mac);
-        seq_printf(seq, "%s", print_mac(mac, addr));
+        seq_printf(seq, "%pM", addr);
 }
 
 static struct sock *llc_get_sk_idx(loff_t pos)
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index fe43ef7dd7e3..f72ba774c246 100644
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -243,12 +243,11 @@ static int recv_notification(struct notifier_block *nb, unsigned long evt,
 static char *eth_addr2str(struct tipc_media_addr *a, char *str_buf, int str_size)
 {
         unchar *addr = (unchar *)&a->dev_addr;
-        DECLARE_MAC_BUF(mac);
 
         if (str_size < 18)
                 *str_buf = '\0';
         else
-                sprintf(str_buf, "%s", print_mac(mac, addr));
+                sprintf(str_buf, "%pM", addr);
         return str_buf;
 }