staging: rtl8192e: Remove MAC_FMT and MAC_ARG for %pM

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 10 insertions, 11 deletions

diff --git a/drivers/staging/rtl8192e/rtllib_crypt_tkip.c b/drivers/staging/rtl8192e/rtllib_crypt_tkip.c
index c4e490e57ad..6a0c8788642 100644
--- a/drivers/staging/rtl8192e/rtllib_crypt_tkip.c
+++ b/drivers/staging/rtl8192e/rtllib_crypt_tkip.c
@@ -400,7 +400,7 @@ static int rtllib_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 " MAC_FMT "\n", MAC_ARG(hdr->addr2));
+                               " flag from %pM\n", hdr->addr2);
                 }
                 return -2;
         }
@@ -412,9 +412,9 @@ static int rtllib_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 " MAC_FMT
+                        printk(KERN_DEBUG "TKIP: received packet from %pM"
                                " with keyid=%d that does not have a configured"
-                               " key\n", MAC_ARG(hdr->addr2), keyidx);
+                               " key\n", hdr->addr2, keyidx);
                 }
                 return -3;
         }
@@ -428,9 +428,8 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
                     tkey->initialized) {
                         if (net_ratelimit()) {
                                 printk(KERN_DEBUG "TKIP: replay detected: STA="
-                                       MAC_FMT
-                                       " previous TSC %08x%04x received TSC "
-                                      "%08x%04x\n", MAC_ARG(hdr->addr2),
+                                       " %pM previous TSC %08x%04x received "
+                                      "TSC %08x%04x\n",hdr->addr2,
                                       tkey->rx_iv32, tkey->rx_iv16, iv32, iv16);
                         }
                         tkey->dot11RSNAStatsTKIPReplays++;
@@ -453,8 +452,8 @@ static int rtllib_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 " MAC_FMT "\n",
-                                                MAC_ARG(hdr->addr2));
+                                       "received packet from %pM\n",
+                                       hdr->addr2);
                         }
                         return -7;
                 }
@@ -474,7 +473,7 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
                         }
                         if (net_ratelimit()) {
                                 printk(KERN_DEBUG "TKIP: ICV error detected: STA="
-                                MAC_FMT "\n", MAC_ARG(hdr->addr2));
+                                " %pM\n", hdr->addr2);
                         }
                         tkey->dot11RSNAStatsTKIPICVErrors++;
                         return -5;
@@ -624,8 +623,8 @@ static int rtllib_michael_mic_verify(struct sk_buff *skb, int keyidx,
                 struct rtllib_hdr_4addr *hdr;
                 hdr = (struct rtllib_hdr_4addr *) skb->data;
                 printk(KERN_DEBUG "%s: Michael MIC verification failed for "
-                       "MSDU from " MAC_FMT " keyidx=%d\n",
-                       skb->dev ? skb->dev->name : "N/A", MAC_ARG(hdr->addr2),
+                       "MSDU from %pM keyidx=%d\n",
+                       skb->dev ? skb->dev->name : "N/A", hdr->addr2,
                        keyidx);
                 printk(KERN_DEBUG "%d, force_mic_error = %d\n",
                        (memcmp(mic, skb->data + skb->len - 8, 8) != 0),\