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

7 files changed, 94 insertions, 68 deletions

diff --git a/net/ieee80211/ieee80211_crypt_ccmp.c b/net/ieee80211/ieee80211_crypt_ccmp.c
index 2e6b099fc84c..0936a3e0210b 100644
--- a/net/ieee80211/ieee80211_crypt_ccmp.c
+++ b/net/ieee80211/ieee80211_crypt_ccmp.c
@@ -297,6 +297,7 @@ 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 +310,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 " MAC_FMT "\n", MAC_ARG(hdr->addr2));
+                               " flag from %s\n", print_mac(mac, hdr->addr2));
                 }
                 key->dot11RSNAStatsCCMPFormatErrors++;
                 return -2;
@@ -322,9 +323,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 " MAC_FMT
+                        printk(KERN_DEBUG "CCMP: received packet from %s"
                                " with keyid=%d that does not have a configured"
-                               " key\n", MAC_ARG(hdr->addr2), keyidx);
+                               " key\n", print_mac(mac, hdr->addr2), keyidx);
                 }
                 return -3;
         }
@@ -339,11 +340,13 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
 
         if (ccmp_replay_check(pn, key->rx_pn)) {
                 if (net_ratelimit()) {
-                        IEEE80211_DEBUG_DROP("CCMP: replay detected: STA=" MAC_FMT
-                               " previous PN %02x%02x%02x%02x%02x%02x "
-                               "received PN %02x%02x%02x%02x%02x%02x\n",
-                               MAC_ARG(hdr->addr2), MAC_ARG(key->rx_pn),
-                               MAC_ARG(pn));
+                        IEEE80211_DEBUG_DROP("CCMP: replay detected: STA=%s "
+                                 "previous PN %02x%02x%02x%02x%02x%02x "
+                                 "received PN %02x%02x%02x%02x%02x%02x\n",
+                                 print_mac(mac, 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]);
                 }
                 key->dot11RSNAStatsCCMPReplays++;
                 return -4;
@@ -371,7 +374,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="
-                               MAC_FMT "\n", MAC_ARG(hdr->addr2));
+                               "%s\n", print_mac(mac, hdr->addr2));
                 }
                 key->dot11RSNAStatsCCMPDecryptErrors++;
                 return -5;
@@ -443,12 +446,16 @@ static int ieee80211_ccmp_get_key(void *key, int len, u8 * seq, void *priv)
 static char *ieee80211_ccmp_print_stats(char *p, void *priv)
 {
         struct ieee80211_ccmp_data *ccmp = priv;
+
         p += sprintf(p, "key[%d] alg=CCMP key_set=%d "
                      "tx_pn=%02x%02x%02x%02x%02x%02x "
                      "rx_pn=%02x%02x%02x%02x%02x%02x "
                      "format_errors=%d replays=%d decrypt_errors=%d\n",
                      ccmp->key_idx, ccmp->key_set,
-                     MAC_ARG(ccmp->tx_pn), MAC_ARG(ccmp->rx_pn),
+                     ccmp->tx_pn[0], ccmp->tx_pn[1], ccmp->tx_pn[2],
+                     ccmp->tx_pn[3], ccmp->tx_pn[4], ccmp->tx_pn[5],
+                     ccmp->rx_pn[0], ccmp->rx_pn[1], ccmp->rx_pn[2],
+                     ccmp->rx_pn[3], ccmp->rx_pn[4], ccmp->rx_pn[5],
                      ccmp->dot11RSNAStatsCCMPFormatErrors,
                      ccmp->dot11RSNAStatsCCMPReplays,
                      ccmp->dot11RSNAStatsCCMPDecryptErrors);
diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c
index 5a48d8e0aec1..6cc54eeca3ed 100644
--- a/net/ieee80211/ieee80211_crypt_tkip.c
+++ b/net/ieee80211/ieee80211_crypt_tkip.c
@@ -359,14 +359,15 @@ 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 " MAC_FMT "\n",
-                               MAC_ARG(hdr->addr1));
+                               "TX packet to %s\n",
+                               print_mac(mac, hdr->addr1));
                 }
                 return -1;
         }
@@ -421,14 +422,15 @@ 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 " MAC_FMT "\n",
-                               MAC_ARG(hdr->addr2));
+                               "received packet from %s\n",
+                               print_mac(mac, hdr->addr2));
                 }
                 return -1;
         }
@@ -441,7 +443,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 " MAC_FMT "\n", MAC_ARG(hdr->addr2));
+                               " flag from %s\n", print_mac(mac, hdr->addr2));
                 }
                 return -2;
         }
@@ -453,9 +455,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 " MAC_FMT
+                        printk(KERN_DEBUG "TKIP: received packet from %s"
                                " with keyid=%d that does not have a configured"
-                               " key\n", MAC_ARG(hdr->addr2), keyidx);
+                               " key\n", print_mac(mac, hdr->addr2), keyidx);
                 }
                 return -3;
         }
@@ -465,9 +467,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 (net_ratelimit()) {
-                        IEEE80211_DEBUG_DROP("TKIP: replay detected: STA=" MAC_FMT
+                        IEEE80211_DEBUG_DROP("TKIP: replay detected: STA=%s"
                                " previous TSC %08x%04x received TSC "
-                               "%08x%04x\n", MAC_ARG(hdr->addr2),
+                               "%08x%04x\n", print_mac(mac, hdr->addr2),
                                tkey->rx_iv32, tkey->rx_iv16, iv32, iv16);
                 }
                 tkey->dot11RSNAStatsTKIPReplays++;
@@ -489,8 +491,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 " MAC_FMT "\n",
-                               MAC_ARG(hdr->addr2));
+                               "received packet from %s\n",
+                               print_mac(mac, hdr->addr2));
                 }
                 return -7;
         }
@@ -508,7 +510,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
                 }
                 if (net_ratelimit()) {
                         IEEE80211_DEBUG_DROP("TKIP: ICV error detected: STA="
-                               MAC_FMT "\n", MAC_ARG(hdr->addr2));
+                               "%s\n", print_mac(mac, hdr->addr2));
                 }
                 tkey->dot11RSNAStatsTKIPICVErrors++;
                 return -5;
@@ -639,6 +641,7 @@ 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;
@@ -651,8 +654,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 " MAC_FMT " keyidx=%d\n",
-                       skb->dev ? skb->dev->name : "N/A", MAC_ARG(hdr->addr2),
+                       "MSDU from %s keyidx=%d\n",
+                       skb->dev ? skb->dev->name : "N/A", print_mac(mac, 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 6284c99b456e..21c0fadde03b 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -271,6 +271,7 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb,
 {
         struct ieee80211_hdr_3addr *hdr;
         int res, hdrlen;
+        DECLARE_MAC_BUF(mac);
 
         if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL)
                 return 0;
@@ -282,8 +283,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", MAC_ARG(hdr->addr2), res);
+                IEEE80211_DEBUG_DROP("decryption failed (SA=%s"
+                                     ") res=%d\n", print_mac(mac, hdr->addr2), res);
                 if (res == -2)
                         IEEE80211_DEBUG_DROP("Decryption failed ICV "
                                              "mismatch (key %d)\n",
@@ -303,6 +304,7 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee,
 {
         struct ieee80211_hdr_3addr *hdr;
         int res, hdrlen;
+        DECLARE_MAC_BUF(mac);
 
         if (crypt == NULL || crypt->ops->decrypt_msdu == NULL)
                 return 0;
@@ -315,8 +317,8 @@ 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, MAC_ARG(hdr->addr2), keyidx);
+                       " (SA=%s keyidx=%d)\n",
+                       ieee->dev->name, print_mac(mac, hdr->addr2), keyidx);
                 return -1;
         }
 
@@ -350,6 +352,7 @@ 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;
@@ -459,8 +462,8 @@ 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",
-                                             MAC_ARG(hdr->addr2));
+                                             " (SA=%s)\n",
+                                             print_mac(mac, hdr->addr2));
                         ieee->ieee_stats.rx_discards_undecryptable++;
                         goto rx_dropped;
                 }
@@ -471,8 +474,8 @@ 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,
-                               MAC_ARG(hdr->addr2));
+                               "from %s\n", dev->name,
+                               print_mac(mac, hdr->addr2));
                         /* TODO: could inform hostapd about this so that it
                          * could send auth failure report */
                         goto rx_dropped;
@@ -650,8 +653,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", MAC_ARG(hdr->addr2));
+                                             "frame not encrypted (SA=%s"
+                                             ")\n", print_mac(mac, hdr->addr2));
                         goto rx_dropped;
                 }
         }
@@ -659,9 +662,9 @@ 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
+                                     "frame from %s"
                                      " (drop_unencrypted=1)\n",
-                                     MAC_ARG(hdr->addr2));
+                                     print_mac(mac, hdr->addr2));
                 goto rx_dropped;
         }
 
@@ -1411,6 +1414,8 @@ 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;
@@ -1457,11 +1462,11 @@ static int ieee80211_network_init(struct ieee80211_device *ieee, struct ieee8021
         }
 
         if (network->mode == 0) {
-                IEEE80211_DEBUG_SCAN("Filtered out '%s (" MAC_FMT ")' "
+                IEEE80211_DEBUG_SCAN("Filtered out '%s (%s)' "
                                      "network.\n",
                                      escape_essid(network->ssid,
                                                   network->ssid_len),
-                                     MAC_ARG(network->bssid));
+                                     print_mac(mac, network->bssid));
                 return 1;
         }
 
@@ -1490,6 +1495,7 @@ 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;
@@ -1503,8 +1509,8 @@ static void update_network(struct ieee80211_network *dst,
                 memcpy(&dst->stats, &src->stats,
                        sizeof(struct ieee80211_rx_stats));
         else
-                IEEE80211_DEBUG_SCAN("Network " MAC_FMT " info received "
-                        "off channel (%d vs. %d)\n", MAC_ARG(src->bssid),
+                IEEE80211_DEBUG_SCAN("Network %s info received "
+                        "off channel (%d vs. %d)\n", print_mac(mac, src->bssid),
                         dst->channel, src->stats.received_channel);
 
         dst->capability = src->capability;
@@ -1576,12 +1582,13 @@ 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' (" MAC_FMT
+        IEEE80211_DEBUG_SCAN("'%s' (%s"
                              "): %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),
-                             MAC_ARG(beacon->header.addr3),
+                             print_mac(mac, beacon->header.addr3),
                              (beacon->capability & (1 << 0xf)) ? '1' : '0',
                              (beacon->capability & (1 << 0xe)) ? '1' : '0',
                              (beacon->capability & (1 << 0xd)) ? '1' : '0',
@@ -1600,10 +1607,10 @@ static void ieee80211_process_probe_response(struct ieee80211_device
                              (beacon->capability & (1 << 0x0)) ? '1' : '0');
 
         if (ieee80211_network_init(ieee, beacon, &network, stats)) {
-                IEEE80211_DEBUG_SCAN("Dropped '%s' (" MAC_FMT ") via %s.\n",
+                IEEE80211_DEBUG_SCAN("Dropped '%s' (%s) via %s.\n",
                                      escape_essid(info_element->data,
                                                   info_element->len),
-                                     MAC_ARG(beacon->header.addr3),
+                                     print_mac(mac, beacon->header.addr3),
                                      is_beacon(beacon->header.frame_ctl) ?
                                      "BEACON" : "PROBE RESPONSE");
                 return;
@@ -1637,11 +1644,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' (" MAC_FMT ") from "
+                        IEEE80211_DEBUG_SCAN("Expired '%s' (%s) from "
                                              "network list.\n",
                                              escape_essid(target->ssid,
                                                           target->ssid_len),
-                                             MAC_ARG(target->bssid));
+                                             print_mac(mac, target->bssid));
                         ieee80211_network_reset(target);
                 } else {
                         /* Otherwise just pull from the free list */
@@ -1651,10 +1658,10 @@ static void ieee80211_process_probe_response(struct ieee80211_device
                 }
 
 #ifdef CONFIG_IEEE80211_DEBUG
-                IEEE80211_DEBUG_SCAN("Adding '%s' (" MAC_FMT ") via %s.\n",
+                IEEE80211_DEBUG_SCAN("Adding '%s' (%s) via %s.\n",
                                      escape_essid(network.ssid,
                                                   network.ssid_len),
-                                     MAC_ARG(network.bssid),
+                                     print_mac(mac, network.bssid),
                                      is_beacon(beacon->header.frame_ctl) ?
                                      "BEACON" : "PROBE RESPONSE");
 #endif
@@ -1662,10 +1669,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' (" MAC_FMT ") via %s.\n",
+                IEEE80211_DEBUG_SCAN("Updating '%s' (%s) via %s.\n",
                                      escape_essid(target->ssid,
                                                   target->ssid_len),
-                                     MAC_ARG(target->bssid),
+                                     print_mac(mac, 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 465b73d50532..9b58dd67acb6 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -257,6 +257,7 @@ 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");
 
@@ -274,10 +275,10 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
                         ev = ieee80211_translate_scan(ieee, ev, stop, network);
                 else
                         IEEE80211_DEBUG_SCAN("Not showing network '%s ("
-                                             MAC_FMT ")' due to age (%dms).\n",
+                                             "%s)' due to age (%dms).\n",
                                              escape_essid(network->ssid,
                                                           network->ssid_len),
-                                             MAC_ARG(network->bssid),
+                                             print_mac(mac, network->bssid),
                                              jiffies_to_msecs(jiffies -
                                                               network->
                                                               last_scanned));
diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c
index e475f2e1be13..4c0feb2dacd8 100644
--- a/net/ieee80211/softmac/ieee80211softmac_assoc.c
+++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c
@@ -372,6 +372,7 @@ ieee80211softmac_handle_assoc_response(struct net_device * dev,
         u16 status = le16_to_cpup(&resp->status);
         struct ieee80211softmac_network *network = NULL;
         unsigned long flags;
+        DECLARE_MAC_BUF(mac2);
 
         if (unlikely(!mac->running))
                 return -ENODEV;
@@ -388,7 +389,8 @@ ieee80211softmac_handle_assoc_response(struct net_device * dev,
 
         /* someone sending us things without us knowing him? Ignore. */
         if (!network) {
-                dprintk(KERN_INFO PFX "Received unrequested assocation response from " MAC_FMT "\n", MAC_ARG(resp->header.addr3));
+                dprintk(KERN_INFO PFX "Received unrequested assocation response from %s\n",
+                        print_mac(mac2, resp->header.addr3));
                 spin_unlock_irqrestore(&mac->lock, flags);
                 return 0;
         }
diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c
index 826c32d24461..855fa0fe641b 100644
--- a/net/ieee80211/softmac/ieee80211softmac_auth.c
+++ b/net/ieee80211/softmac/ieee80211softmac_auth.c
@@ -35,6 +35,7 @@ ieee80211softmac_auth_req(struct ieee80211softmac_device *mac,
 {
         struct ieee80211softmac_auth_queue_item *auth;
         unsigned long flags;
+        DECLARE_MAC_BUF(mac2);
 
         if (net->authenticating || net->authenticated)
                 return 0;
@@ -43,7 +44,7 @@ ieee80211softmac_auth_req(struct ieee80211softmac_device *mac,
         /* Add the network if it's not already added */
         ieee80211softmac_add_network(mac, net);
 
-        dprintk(KERN_NOTICE PFX "Queueing Authentication Request to "MAC_FMT"\n", MAC_ARG(net->bssid));
+        dprintk(KERN_NOTICE PFX "Queueing Authentication Request to %s\n", print_mac(mac2, net->bssid));
         /* Queue the auth request */
         auth = (struct ieee80211softmac_auth_queue_item *)
                 kmalloc(sizeof(struct ieee80211softmac_auth_queue_item), GFP_KERNEL);
@@ -76,6 +77,7 @@ ieee80211softmac_auth_queue(struct work_struct *work)
         struct ieee80211softmac_auth_queue_item *auth;
         struct ieee80211softmac_network *net;
         unsigned long flags;
+        DECLARE_MAC_BUF(mac2);
 
         auth = container_of(work, struct ieee80211softmac_auth_queue_item,
                             work.work);
@@ -99,13 +101,14 @@ ieee80211softmac_auth_queue(struct work_struct *work)
                 auth->retry--;
                 spin_unlock_irqrestore(&mac->lock, flags);
                 if (ieee80211softmac_send_mgt_frame(mac, auth->net, IEEE80211_STYPE_AUTH, auth->state))
-                        dprintk(KERN_NOTICE PFX "Sending Authentication Request to "MAC_FMT" failed (this shouldn't happen, wait for the timeout).\n", MAC_ARG(net->bssid));
+                        dprintk(KERN_NOTICE PFX "Sending Authentication Request to %s failed (this shouldn't happen, wait for the timeout).\n",
+                                print_mac(mac2, net->bssid));
                 else
-                        dprintk(KERN_NOTICE PFX "Sent Authentication Request to "MAC_FMT".\n", MAC_ARG(net->bssid));
+                        dprintk(KERN_NOTICE PFX "Sent Authentication Request to %s.\n", print_mac(mac2, net->bssid));
                 return;
         }
 
-        printkl(KERN_WARNING PFX "Authentication timed out with "MAC_FMT"\n", MAC_ARG(net->bssid));
+        printkl(KERN_WARNING PFX "Authentication timed out with %s\n", print_mac(mac2, net->bssid));
         /* Remove this item from the queue */
         spin_lock_irqsave(&mac->lock, flags);
         net->authenticating = 0;
@@ -142,6 +145,7 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth)
         struct ieee80211softmac_network *net = NULL;
         unsigned long flags;
         u8 * data;
+        DECLARE_MAC_BUF(mac2);
 
         if (unlikely(!mac->running))
                 return -ENODEV;
@@ -161,7 +165,7 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth)
         /* Make sure that we've got an auth queue item for this request */
         if(aq == NULL)
         {
-                dprintkl(KERN_DEBUG PFX "Authentication response received from "MAC_FMT" but no queue item exists.\n", MAC_ARG(auth->header.addr2));
+                dprintkl(KERN_DEBUG PFX "Authentication response received from %s but no queue item exists.\n", print_mac(mac2, auth->header.addr2));
                 /* Error #? */
                 return -1;
         }
@@ -169,7 +173,7 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth)
         /* Check for out of order authentication */
         if(!net->authenticating)
         {
-                dprintkl(KERN_DEBUG PFX "Authentication response received from "MAC_FMT" but did not request authentication.\n",MAC_ARG(auth->header.addr2));
+                dprintkl(KERN_DEBUG PFX "Authentication response received from %s but did not request authentication.\n",print_mac(mac2, auth->header.addr2));
                 return -1;
         }
 
@@ -187,7 +191,7 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth)
                         spin_unlock_irqrestore(&mac->lock, flags);
 
                         /* Send event */
-                        printkl(KERN_NOTICE PFX "Open Authentication completed with "MAC_FMT"\n", MAC_ARG(net->bssid));
+                        printkl(KERN_NOTICE PFX "Open Authentication completed with %s\n", print_mac(mac2, net->bssid));
                         ieee80211softmac_call_events(mac, IEEE80211SOFTMAC_EVENT_AUTHENTICATED, net);
                         break;
                 default:
@@ -197,8 +201,8 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth)
                         net->authenticating = 0;
                         spin_unlock_irqrestore(&mac->lock, flags);
 
-                        printkl(KERN_NOTICE PFX "Open Authentication with "MAC_FMT" failed, error code: %i\n",
-                                MAC_ARG(net->bssid), le16_to_cpup(&auth->status));
+                        printkl(KERN_NOTICE PFX "Open Authentication with %s failed, error code: %i\n",
+                                print_mac(mac2, net->bssid), le16_to_cpup(&auth->status));
                         /* Count the error? */
                         break;
                 }
@@ -253,13 +257,13 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth)
                                 net->authenticating = 0;
                                 net->authenticated = 1;
                                 spin_unlock_irqrestore(&mac->lock, flags);
-                                printkl(KERN_NOTICE PFX "Shared Key Authentication completed with "MAC_FMT"\n",
-                                        MAC_ARG(net->bssid));
+                                printkl(KERN_NOTICE PFX "Shared Key Authentication completed with %s\n",
+                                        print_mac(mac2, net->bssid));
                                 ieee80211softmac_call_events(mac, IEEE80211SOFTMAC_EVENT_AUTHENTICATED, net);
                                 break;
                         default:
-                                printkl(KERN_NOTICE PFX "Shared Key Authentication with "MAC_FMT" failed, error code: %i\n",
-                                        MAC_ARG(net->bssid), le16_to_cpup(&auth->status));
+                                printkl(KERN_NOTICE PFX "Shared Key Authentication with %s failed, error code: %i\n",
+                                        print_mac(mac2, net->bssid), le16_to_cpup(&auth->status));
                                 /* Lock and reset flags */
                                 spin_lock_irqsave(&mac->lock, flags);
                                 net->authenticating = 0;
@@ -375,6 +379,7 @@ ieee80211softmac_deauth_resp(struct net_device *dev, struct ieee80211_deauth *de
 
         struct ieee80211softmac_network *net = NULL;
         struct ieee80211softmac_device *mac = ieee80211_priv(dev);
+        DECLARE_MAC_BUF(mac2);
 
         if (unlikely(!mac->running))
                 return -ENODEV;
@@ -387,8 +392,8 @@ ieee80211softmac_deauth_resp(struct net_device *dev, struct ieee80211_deauth *de
         net = ieee80211softmac_get_network_by_bssid(mac, deauth->header.addr2);
 
         if (net == NULL) {
-                dprintkl(KERN_DEBUG PFX "Received deauthentication packet from "MAC_FMT", but that network is unknown.\n",
-                        MAC_ARG(deauth->header.addr2));
+                dprintkl(KERN_DEBUG PFX "Received deauthentication packet from %s, but that network is unknown.\n",
+                        print_mac(mac2, deauth->header.addr2));
                 return 0;
         }
 
diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c
index 5742dc803b79..8e8ad08a411c 100644
--- a/net/ieee80211/softmac/ieee80211softmac_wx.c
+++ b/net/ieee80211/softmac/ieee80211softmac_wx.c
@@ -72,6 +72,7 @@ ieee80211softmac_wx_set_essid(struct net_device *net_dev,
         struct ieee80211softmac_device *sm = ieee80211_priv(net_dev);
         struct ieee80211softmac_auth_queue_item *authptr;
         int length = 0;
+        DECLARE_MAC_BUF(mac);
 
 check_assoc_again:
         mutex_lock(&sm->associnfo.mutex);