[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, 6 insertions, 4 deletions

diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c
index b9c1d5405180..5b11f14abfba 100644
--- a/net/mac80211/tkip.c
+++ b/net/mac80211/tkip.c
@@ -275,9 +275,10 @@ int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm,
              (iv32 == key->u.tkip.iv32_rx[queue] &&
               iv16 <= key->u.tkip.iv16_rx[queue]))) {
 #ifdef CONFIG_TKIP_DEBUG
+                DECLARE_MAC_BUF(mac);
                 printk(KERN_DEBUG "TKIP replay detected for RX frame from "
-                       MAC_FMT " (RX IV (%04x,%02x) <= prev. IV (%04x,%02x)\n",
-                       MAC_ARG(ta),
+                       "%s (RX IV (%04x,%02x) <= prev. IV (%04x,%02x)\n",
+                       print_mac(mac, ta),
                        iv32, iv16, key->u.tkip.iv32_rx[queue],
                        key->u.tkip.iv16_rx[queue]);
 #endif /* CONFIG_TKIP_DEBUG */
@@ -299,8 +300,9 @@ int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm,
 #ifdef CONFIG_TKIP_DEBUG
                 {
                         int i;
-                        printk(KERN_DEBUG "TKIP decrypt: Phase1 TA=" MAC_FMT
-                               " TK=", MAC_ARG(ta));
+                        DECLARE_MAC_BUF(mac);
+                        printk(KERN_DEBUG "TKIP decrypt: Phase1 TA=%s"
+                               " TK=", print_mac(mac, ta));
                         for (i = 0; i < 16; i++)
                                 printk("%02x ",
                                        key->conf.key[