46 files changed, 685 insertions, 581 deletions
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index eec01fc15282..ac2ea237019d 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -1787,6 +1787,7 @@ static int __devinit adm8211_probe(struct pci_dev *pdev,
        int err;
        u32 reg;
        u8 perm_addr[ETH_ALEN];
+        DECLARE_MAC_BUF(mac);
 #ifndef MODULE
        static unsigned int cardidx;
@@ -1938,8 +1939,8 @@ static int __devinit adm8211_probe(struct pci_dev *pdev,
                goto err_free_desc;
        }
-        printk(KERN_INFO "%s: hwaddr " MAC_FMT ", Rev 0x%02x\n",
+        printk(KERN_INFO "%s: hwaddr %s, Rev 0x%02x\n",
-               wiphy_name(dev->wiphy), MAC_ARG(dev->wiphy->perm_addr),
+               wiphy_name(dev->wiphy), print_mac(mac, dev->wiphy->perm_addr),
               priv->revid);
        return 0;
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 7d717c4d9845..95d3cd1c49a7 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -2821,6 +2821,7 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,
        struct net_device *dev;
        struct airo_info *ai;
        int i, rc;
+        DECLARE_MAC_BUF(mac);
        /* Create the network device object. */
        dev = alloc_netdev(sizeof(*ai), "", ether_setup);
@@ -2923,9 +2924,8 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,
                goto err_out_reg;
        set_bit(FLAG_REGISTERED,&ai->flags);
-        airo_print_info(dev->name, "MAC enabled %x:%x:%x:%x:%x:%x",
+        airo_print_info(dev->name, "MAC enabled %s",
-                dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
+                        print_mac(mac, dev->dev_addr));
-                dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5] );
        /* Allocate the transmit buffers */
        if (probe && !test_bit(FLAG_MPI,&ai->flags))
@@ -2982,6 +2982,7 @@ int reset_airo_card( struct net_device *dev )
 {
        int i;
        struct airo_info *ai = dev->priv;
+        DECLARE_MAC_BUF(mac);
        if (reset_card (dev, 1))
                return -1;
@@ -2990,9 +2991,8 @@ int reset_airo_card( struct net_device *dev )
                airo_print_err(dev->name, "MAC could not be enabled");
                return -1;
        }
-        airo_print_info(dev->name, "MAC enabled %x:%x:%x:%x:%x:%x",
+        airo_print_info(dev->name, "MAC enabled %s",
-                        dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
+                        print_mac(mac, dev->dev_addr));
-                        dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
        /* Allocate the transmit buffers if needed */
        if (!test_bit(FLAG_MPI,&ai->flags))
                for( i = 0; i < MAX_FIDS; i++ )
@@ -5426,6 +5426,7 @@ static int proc_APList_open( struct inode *inode, struct file *file ) {
        int i;
        char *ptr;
        APListRid APList_rid;
+        DECLARE_MAC_BUF(mac);
        if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                return -ENOMEM;
@@ -5449,13 +5450,8 @@ static int proc_APList_open( struct inode *inode, struct file *file ) {
 // We end when we find a zero MAC
                if ( !*(int*)APList_rid.ap[i] &&
                     !*(int*)&APList_rid.ap[i][2]) break;
-                ptr += sprintf(ptr, "%02x:%02x:%02x:%02x:%02x:%02x\n",
+                ptr += sprintf(ptr, "%s\n",
-                               (int)APList_rid.ap[i][0],
+                               print_mac(mac, APList_rid.ap[i]));
-                               (int)APList_rid.ap[i][1],
-                               (int)APList_rid.ap[i][2],
-                               (int)APList_rid.ap[i][3],
-                               (int)APList_rid.ap[i][4],
-                               (int)APList_rid.ap[i][5]);
        }
        if (i==0) ptr += sprintf(ptr, "Not using specific APs\n");
@@ -5474,6 +5470,7 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {
        int rc;
        /* If doLoseSync is not 1, we won't do a Lose Sync */
        int doLoseSync = -1;
+        DECLARE_MAC_BUF(mac);
        if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                return -ENOMEM;
@@ -5510,13 +5507,8 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {
           we have to add a spin lock... */
        rc = readBSSListRid(ai, doLoseSync, &BSSList_rid);
        while(rc == 0 && BSSList_rid.index != 0xffff) {
-                ptr += sprintf(ptr, "%02x:%02x:%02x:%02x:%02x:%02x %*s rssi = %d",
+                ptr += sprintf(ptr, "%s %*s rssi = %d",
-                                (int)BSSList_rid.bssid[0],
+                               print_mac(mac, BSSList_rid.bssid),
-                                (int)BSSList_rid.bssid[1],
-                                (int)BSSList_rid.bssid[2],
-                                (int)BSSList_rid.bssid[3],
-                                (int)BSSList_rid.bssid[4],
-                                (int)BSSList_rid.bssid[5],
                                (int)BSSList_rid.ssidLen,
                                BSSList_rid.ssid,
                                (int)BSSList_rid.dBm);
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c
index 3eaaab0ba0cc..dbdfc9e39d20 100644
--- a/drivers/net/wireless/arlan-main.c
+++ b/drivers/net/wireless/arlan-main.c
@@ -1469,10 +1469,10 @@ static void arlan_rx_interrupt(struct net_device *dev, u_char rxStatus, u_short
                                        while (dmi)
                                        {                                                       if (dmi->dmi_addrlen == 6)
                                                {
+                                                        DECLARE_MAC_BUF(mac);
                                                        if (arlan_debug & ARLAN_DEBUG_HEADER_DUMP)
-                                                                printk(KERN_ERR "%s mcl %2x:%2x:%2x:%2x:%2x:%2x \n", dev->name,
+                                                                printk(KERN_ERR "%s mcl %s\n",
-                                                                                 dmi->dmi_addr[0], dmi->dmi_addr[1], dmi->dmi_addr[2],
+                                                                       dev->name, print_mac(mac, dmi->dmi_addr));
-                                                                                 dmi->dmi_addr[3], dmi->dmi_addr[4], dmi->dmi_addr[5]);
                                                        for (i = 0; i < 6; i++)
                                                                if (dmi->dmi_addr[i] != hw_dst_addr[i])
                                                                        break;
@@ -1512,17 +1512,18 @@ static void arlan_rx_interrupt(struct net_device *dev, u_char rxStatus, u_short
                        {
                                char immedDestAddress[6];
                                char immedSrcAddress[6];
+                                DECLARE_MAC_BUF(mac);
+                                DECLARE_MAC_BUF(mac2);
+                                DECLARE_MAC_BUF(mac3);
+                                DECLARE_MAC_BUF(mac4);
                                memcpy_fromio(immedDestAddress, arlan->immedDestAddress, 6);
                                memcpy_fromio(immedSrcAddress, arlan->immedSrcAddress, 6);
-                                printk(KERN_WARNING "%s t %2x:%2x:%2x:%2x:%2x:%2x f %2x:%2x:%2x:%2x:%2x:%2x imd %2x:%2x:%2x:%2x:%2x:%2x ims %2x:%2x:%2x:%2x:%2x:%2x\n", dev->name,
+                                printk(KERN_WARNING "%s t %s f %s imd %s ims %s\n",
-                                        (unsigned char) skbtmp[0], (unsigned char) skbtmp[1], (unsigned char) skbtmp[2], (unsigned char) skbtmp[3],
+                                       dev->name, print_mac(mac, skbtmp),
-                                        (unsigned char) skbtmp[4], (unsigned char) skbtmp[5], (unsigned char) skbtmp[6], (unsigned char) skbtmp[7],
+                                       print_mac(mac2, &skbtmp[6]),
-                                        (unsigned char) skbtmp[8], (unsigned char) skbtmp[9], (unsigned char) skbtmp[10], (unsigned char) skbtmp[11],
+                                       print_mac(mac3, immedDestAddress),
-                                        immedDestAddress[0], immedDestAddress[1], immedDestAddress[2],
+                                       print_mac(mac4, immedSrcAddress));
-                                        immedDestAddress[3], immedDestAddress[4], immedDestAddress[5],
-                                        immedSrcAddress[0], immedSrcAddress[1], immedSrcAddress[2],
-                                        immedSrcAddress[3], immedSrcAddress[4], immedSrcAddress[5]);
                        }
                        skb->protocol = eth_type_trans(skb, dev);
                        IFDEBUG(ARLAN_DEBUG_HEADER_DUMP)
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 47dbdf95ea6f..059ce3f07dba 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -1484,6 +1484,7 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port,
        struct net_device *dev;
        struct atmel_private *priv;
        int rc;
+        DECLARE_MAC_BUF(mac);
        /* Create the network device object. */
        dev = alloc_etherdev(sizeof(*priv));
@@ -1598,10 +1599,8 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port,
        if (!ent)
                printk(KERN_WARNING "atmel: unable to create /proc entry.\n");
-        printk(KERN_INFO "%s: Atmel at76c50x. Version %d.%d. MAC %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
+        printk(KERN_INFO "%s: Atmel at76c50x. Version %d.%d. MAC %s\n",
-               dev->name, DRIVER_MAJOR, DRIVER_MINOR,
+               dev->name, DRIVER_MAJOR, DRIVER_MINOR, print_mac(mac, dev->dev_addr));
-               dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-               dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5] );
        return dev;
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 184ebe3ed738..fd4ef27fcf25 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2883,6 +2883,7 @@ static int b43_dev_set_key(struct ieee80211_hw *hw,
        u8 algorithm;
        u8 index;
        int err = -EINVAL;
+        DECLARE_MAC_BUF(mac);
        if (modparam_nohwcrypt)
                return -ENOSPC; /* User disabled HW-crypto */
@@ -2969,9 +2970,9 @@ out_unlock:
 out:
        if (!err) {
                b43dbg(wl, "%s hardware based encryption for keyidx: %d, "
-                       "mac: " MAC_FMT "\n",
+                       "mac: %s\n",
                       cmd == SET_KEY ? "Using" : "Disabling", key->keyidx,
-                       MAC_ARG(addr));
+                       print_mac(mac, addr));
        }
        return err;
 }
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index ac4831adb574..61b94218094b 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -2679,6 +2679,7 @@ static int b43legacy_dev_set_key(struct ieee80211_hw *hw,
        struct b43legacy_wldev *dev = wl->current_dev;
        unsigned long flags;
        int err = -EOPNOTSUPP;
+        DECLARE_MAC_BUF(mac);
        if (!dev)
                return -ENODEV;
@@ -2691,7 +2692,7 @@ static int b43legacy_dev_set_key(struct ieee80211_hw *hw,
        spin_unlock_irqrestore(&wl->irq_lock, flags);
        mutex_unlock(&wl->mutex);
        b43legacydbg(wl, "Using software based encryption for "
-               "mac: " MAC_FMT "\n", MAC_ARG(addr));
+                     "mac: %s\n", print_mac(mac, addr));
        return err;
 }
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h
index 10e07e865426..5fdbf24d2443 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx.h
@@ -994,10 +994,4 @@ int bcm43xx_pci_write_config32(struct bcm43xx_private *bcm, int offset, u32 valu
                __value;                                \
        })
-/** Helpers to print MAC addresses. */
-#define BCM43xx_MACFMT          "%02x:%02x:%02x:%02x:%02x:%02x"
-#define BCM43xx_MACARG(x)       ((u8*)(x))[0], ((u8*)(x))[1], \
-                                ((u8*)(x))[2], ((u8*)(x))[3], \
-                                ((u8*)(x))[4], ((u8*)(x))[5]
 #endif /* BCM43xx_H_ */
diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c
index cbedc9ee740a..ef084df3d48e 100644
--- a/drivers/net/wireless/hostap/hostap_80211_rx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_rx.c
@@ -19,6 +19,7 @@ void hostap_dump_rx_80211(const char *name, struct sk_buff *skb,
 {
        struct ieee80211_hdr_4addr *hdr;
        u16 fc;
+        DECLARE_MAC_BUF(mac);
        hdr = (struct ieee80211_hdr_4addr *) skb->data;
@@ -44,10 +45,11 @@ void hostap_dump_rx_80211(const char *name, struct sk_buff *skb,
        printk(" dur=0x%04x seq=0x%04x\n", le16_to_cpu(hdr->duration_id),
               le16_to_cpu(hdr->seq_ctl));
-        printk(KERN_DEBUG "   A1=" MACSTR " A2=" MACSTR " A3=" MACSTR,
+        printk(KERN_DEBUG "   A1=%s", print_mac(mac, hdr->addr1));
-               MAC2STR(hdr->addr1), MAC2STR(hdr->addr2), MAC2STR(hdr->addr3));
+        printk(" A2=%s", print_mac(mac, hdr->addr2));
+        printk(" A3=%s", print_mac(mac, hdr->addr3));
        if (skb->len >= 30)
-                printk(" A4=" MACSTR, MAC2STR(hdr->addr4));
+                printk(" A4=%s", print_mac(mac, hdr->addr4));
        printk("\n");
 }
@@ -534,6 +536,7 @@ static int
 hostap_rx_frame_wds(local_info_t *local, struct ieee80211_hdr_4addr *hdr,
                    u16 fc, struct net_device **wds)
 {
+        DECLARE_MAC_BUF(mac);
        /* FIX: is this really supposed to accept WDS frames only in Master
         * mode? What about Repeater or Managed with WDS frames? */
        if ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) !=
@@ -549,10 +552,10 @@ hostap_rx_frame_wds(local_info_t *local, struct ieee80211_hdr_4addr *hdr,
             hdr->addr1[4] != 0xff || hdr->addr1[5] != 0xff)) {
                /* RA (or BSSID) is not ours - drop */
                PDEBUG(DEBUG_EXTRA, "%s: received WDS frame with "
-                       "not own or broadcast %s=" MACSTR "\n",
+                       "not own or broadcast %s=%s\n",
                       local->dev->name,
                       fc & IEEE80211_FCTL_FROMDS ? "RA" : "BSSID",
-                       MAC2STR(hdr->addr1));
+                       print_mac(mac, hdr->addr1));
                return -1;
        }
@@ -565,8 +568,8 @@ hostap_rx_frame_wds(local_info_t *local, struct ieee80211_hdr_4addr *hdr,
                /* require that WDS link has been registered with TA or the
                 * frame is from current AP when using 'AP client mode' */
                PDEBUG(DEBUG_EXTRA, "%s: received WDS[4 addr] frame "
-                       "from unknown TA=" MACSTR "\n",
+                       "from unknown TA=%s\n",
-                       local->dev->name, MAC2STR(hdr->addr2));
+                       local->dev->name, print_mac(mac, hdr->addr2));
                if (local->ap && local->ap->autom_ap_wds)
                        hostap_wds_link_oper(local, hdr->addr2, WDS_ADD);
                return -1;
@@ -632,6 +635,7 @@ hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb,
 {
        struct ieee80211_hdr_4addr *hdr;
        int res, hdrlen;
+        DECLARE_MAC_BUF(mac);
        if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL)
                return 0;
@@ -643,8 +647,8 @@ hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb,
            strcmp(crypt->ops->name, "TKIP") == 0) {
                if (net_ratelimit()) {
                        printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
-                               "received packet from " MACSTR "\n",
+                               "received packet from %s\n",
-                               local->dev->name, MAC2STR(hdr->addr2));
+                               local->dev->name, print_mac(mac, hdr->addr2));
                }
                return -1;
        }
@@ -653,9 +657,9 @@ hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb,
        res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv);
        atomic_dec(&crypt->refcnt);
        if (res < 0) {
-                printk(KERN_DEBUG "%s: decryption failed (SA=" MACSTR
+                printk(KERN_DEBUG "%s: decryption failed (SA=%s"
                       ") res=%d\n",
-                       local->dev->name, MAC2STR(hdr->addr2), res);
+                       local->dev->name, print_mac(mac, hdr->addr2), res);
                local->comm_tallies.rx_discards_wep_undecryptable++;
                return -1;
        }
@@ -671,6 +675,7 @@ hostap_rx_frame_decrypt_msdu(local_info_t *local, struct sk_buff *skb,
 {
        struct ieee80211_hdr_4addr *hdr;
        int res, hdrlen;
+        DECLARE_MAC_BUF(mac);
        if (crypt == NULL || crypt->ops->decrypt_msdu == NULL)
                return 0;
@@ -683,8 +688,8 @@ hostap_rx_frame_decrypt_msdu(local_info_t *local, struct sk_buff *skb,
        atomic_dec(&crypt->refcnt);
        if (res < 0) {
                printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed"
-                       " (SA=" MACSTR " keyidx=%d)\n",
+                       " (SA=%s keyidx=%d)\n",
-                       local->dev->name, MAC2STR(hdr->addr2), keyidx);
+                       local->dev->name, print_mac(mac, hdr->addr2), keyidx);
                return -1;
        }
@@ -716,6 +721,7 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
        struct ieee80211_crypt_data *crypt = NULL;
        void *sta = NULL;
        int keyidx = 0;
+        DECLARE_MAC_BUF(mac);
        iface = netdev_priv(dev);
        local = iface->local;
@@ -792,8 +798,8 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
                         * frames silently instead of filling system log with
                         * these reports. */
                        printk(KERN_DEBUG "%s: WEP decryption failed (not set)"
-                               " (SA=" MACSTR ")\n",
+                               " (SA=%s)\n",
-                               local->dev->name, MAC2STR(hdr->addr2));
+                               local->dev->name, print_mac(mac, hdr->addr2));
 #endif
                        local->comm_tallies.rx_discards_wep_undecryptable++;
                        goto rx_dropped;
@@ -807,8 +813,8 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
                    (keyidx = hostap_rx_frame_decrypt(local, skb, crypt)) < 0)
                {
                        printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth "
-                               "from " MACSTR "\n", dev->name,
+                               "from %s\n", dev->name,
-                               MAC2STR(hdr->addr2));
+                               print_mac(mac, hdr->addr2));
                        /* TODO: could inform hostapd about this so that it
                         * could send auth failure report */
                        goto rx_dropped;
@@ -976,8 +982,8 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
                               "unencrypted EAPOL frame\n", local->dev->name);
                } else {
                        printk(KERN_DEBUG "%s: encryption configured, but RX "
-                               "frame not encrypted (SA=" MACSTR ")\n",
+                               "frame not encrypted (SA=%s)\n",
-                               local->dev->name, MAC2STR(hdr->addr2));
+                               local->dev->name, print_mac(mac, hdr->addr2));
                        goto rx_dropped;
                }
        }
@@ -986,8 +992,9 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
            !hostap_is_eapol_frame(local, skb)) {
                if (net_ratelimit()) {
                        printk(KERN_DEBUG "%s: dropped unencrypted RX data "
-                               "frame from " MACSTR " (drop_unencrypted=1)\n",
+                               "frame from %s"
-                               dev->name, MAC2STR(hdr->addr2));
+                               " (drop_unencrypted=1)\n",
+                               dev->name, print_mac(mac, hdr->addr2));
                }
                goto rx_dropped;
        }
diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/hostap/hostap_80211_tx.c
index 3df3c60263d4..e7afc3ec3e6d 100644
--- a/drivers/net/wireless/hostap/hostap_80211_tx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_tx.c
@@ -17,6 +17,7 @@ void hostap_dump_tx_80211(const char *name, struct sk_buff *skb)
 {
        struct ieee80211_hdr_4addr *hdr;
        u16 fc;
+        DECLARE_MAC_BUF(mac);
        hdr = (struct ieee80211_hdr_4addr *) skb->data;
@@ -40,10 +41,11 @@ void hostap_dump_tx_80211(const char *name, struct sk_buff *skb)
        printk(" dur=0x%04x seq=0x%04x\n", le16_to_cpu(hdr->duration_id),
               le16_to_cpu(hdr->seq_ctl));
-        printk(KERN_DEBUG "   A1=" MACSTR " A2=" MACSTR " A3=" MACSTR,
+        printk(KERN_DEBUG "   A1=%s", print_mac(mac, hdr->addr1));
-               MAC2STR(hdr->addr1), MAC2STR(hdr->addr2), MAC2STR(hdr->addr3));
+        printk(" A2=%s", print_mac(mac, hdr->addr2));
+        printk(" A3=%s", print_mac(mac, hdr->addr3));
        if (skb->len >= 30)
-                printk(" A4=" MACSTR, MAC2STR(hdr->addr4));
+                printk(" A4=%s", print_mac(mac, hdr->addr4));
        printk("\n");
 }
@@ -312,6 +314,7 @@ static struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
        struct ieee80211_hdr_4addr *hdr;
        u16 fc;
        int prefix_len, postfix_len, hdr_len, res;
+        DECLARE_MAC_BUF(mac);
        iface = netdev_priv(skb->dev);
        local = iface->local;
@@ -326,8 +329,8 @@ static struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
                hdr = (struct ieee80211_hdr_4addr *) skb->data;
                if (net_ratelimit()) {
                        printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
-                               "TX packet to " MACSTR "\n",
+                               "TX packet to %s\n",
-                               local->dev->name, MAC2STR(hdr->addr1));
+                               local->dev->name, print_mac(mac, hdr->addr1));
                }
                kfree_skb(skb);
                return NULL;
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index 90900525379c..6bbdb76b32df 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -94,6 +94,7 @@ static void ap_sta_hash_add(struct ap_data *ap, struct sta_info *sta)
 static void ap_sta_hash_del(struct ap_data *ap, struct sta_info *sta)
 {
        struct sta_info *s;
+        DECLARE_MAC_BUF(mac);
        s = ap->sta_hash[STA_HASH(sta->addr)];
        if (s == NULL) return;
@@ -108,18 +109,20 @@ static void ap_sta_hash_del(struct ap_data *ap, struct sta_info *sta)
        if (s->hnext != NULL)
                s->hnext = s->hnext->hnext;
        else
-                printk("AP: could not remove STA " MACSTR " from hash table\n",
+                printk("AP: could not remove STA %s"
-                       MAC2STR(sta->addr));
+                       " from hash table\n",
+                       print_mac(mac, sta->addr));
 }
 static void ap_free_sta(struct ap_data *ap, struct sta_info *sta)
 {
+        DECLARE_MAC_BUF(mac);
        if (sta->ap && sta->local)
                hostap_event_expired_sta(sta->local->dev, sta);
        if (ap->proc != NULL) {
                char name[20];
-                sprintf(name, MACSTR, MAC2STR(sta->addr));
+                sprintf(name, "%s", print_mac(mac, sta->addr));
                remove_proc_entry(name, ap->proc);
        }
@@ -182,6 +185,7 @@ static void ap_handle_timer(unsigned long data)
        struct ap_data *ap;
        unsigned long next_time = 0;
        int was_assoc;
+        DECLARE_MAC_BUF(mac);
        if (sta == NULL || sta->local == NULL || sta->local->ap == NULL) {
                PDEBUG(DEBUG_AP, "ap_handle_timer() called with NULL data\n");
@@ -238,8 +242,8 @@ static void ap_handle_timer(unsigned long data)
        if (sta->ap) {
                if (ap->autom_ap_wds) {
                        PDEBUG(DEBUG_AP, "%s: removing automatic WDS "
-                               "connection to AP " MACSTR "\n",
+                               "connection to AP %s\n",
-                               local->dev->name, MAC2STR(sta->addr));
+                               local->dev->name, print_mac(mac, sta->addr));
                        hostap_wds_link_oper(local, sta->addr, WDS_DEL);
                }
        } else if (sta->timeout_next == STA_NULLFUNC) {
@@ -255,11 +259,11 @@ static void ap_handle_timer(unsigned long data)
        } else {
                int deauth = sta->timeout_next == STA_DEAUTH;
                u16 resp;
-                PDEBUG(DEBUG_AP, "%s: sending %s info to STA " MACSTR
+                PDEBUG(DEBUG_AP, "%s: sending %s info to STA %s"
                       "(last=%lu, jiffies=%lu)\n",
                       local->dev->name,
                       deauth ? "deauthentication" : "disassociation",
-                       MAC2STR(sta->addr), sta->last_rx, jiffies);
+                       print_mac(mac, sta->addr), sta->last_rx, jiffies);
                resp = cpu_to_le16(deauth ? WLAN_REASON_PREV_AUTH_NOT_VALID :
                                   WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY);
@@ -271,9 +275,10 @@ static void ap_handle_timer(unsigned long data)
        if (sta->timeout_next == STA_DEAUTH) {
                if (sta->flags & WLAN_STA_PERM) {
-                        PDEBUG(DEBUG_AP, "%s: STA " MACSTR " would have been "
+                        PDEBUG(DEBUG_AP, "%s: STA %s"
-                               "removed, but it has 'perm' flag\n",
+                               " would have been removed, "
-                               local->dev->name, MAC2STR(sta->addr));
+                               "but it has 'perm' flag\n",
+                               local->dev->name, print_mac(mac, sta->addr));
                } else
                        ap_free_sta(ap, sta);
                return;
@@ -327,6 +332,7 @@ static int ap_control_proc_read(char *page, char **start, off_t off,
        struct ap_data *ap = (struct ap_data *) data;
        char *policy_txt;
        struct mac_entry *entry;
+        DECLARE_MAC_BUF(mac);
        if (off != 0) {
                *eof = 1;
@@ -357,7 +363,7 @@ static int ap_control_proc_read(char *page, char **start, off_t off,
                        break;
                }
-                p += sprintf(p, MACSTR "\n", MAC2STR(entry->addr));
+                p += sprintf(p, "%s\n", print_mac(mac, entry->addr));
        }
        spin_unlock_bh(&ap->mac_restrictions.lock);
@@ -514,6 +520,7 @@ static int prism2_ap_proc_read(char *page, char **start, off_t off,
        struct ap_data *ap = (struct ap_data *) data;
        struct sta_info *sta;
        int i;
+        DECLARE_MAC_BUF(mac);
        if (off > PROC_LIMIT) {
                *eof = 1;
@@ -526,7 +533,8 @@ static int prism2_ap_proc_read(char *page, char **start, off_t off,
                if (!sta->ap)
                        continue;
-                p += sprintf(p, MACSTR " %d %d %d %d '", MAC2STR(sta->addr),
+                p += sprintf(p, "%s %d %d %d %d '",
+                             print_mac(mac, sta->addr),
                             sta->u.ap.channel, sta->last_rx_signal,
                             sta->last_rx_silence, sta->last_rx_rate);
                for (i = 0; i < sta->u.ap.ssid_len; i++)
@@ -623,6 +631,7 @@ static void hostap_ap_tx_cb_auth(struct sk_buff *skb, int ok, void *data)
        u16 fc, *pos, auth_alg, auth_transaction, status;
        struct sta_info *sta = NULL;
        char *txt = NULL;
+        DECLARE_MAC_BUF(mac);
        if (ap->local->hostapd) {
                dev_kfree_skb(skb);
@@ -674,9 +683,9 @@ static void hostap_ap_tx_cb_auth(struct sk_buff *skb, int ok, void *data)
        if (sta)
                atomic_dec(&sta->users);
        if (txt) {
-                PDEBUG(DEBUG_AP, "%s: " MACSTR " auth_cb - alg=%d trans#=%d "
+                PDEBUG(DEBUG_AP, "%s: %s auth_cb - alg=%d "
-                       "status=%d - %s\n",
+                       "trans#=%d status=%d - %s\n",
-                       dev->name, MAC2STR(hdr->addr1), auth_alg,
+                       dev->name, print_mac(mac, hdr->addr1), auth_alg,
                       auth_transaction, status, txt);
        }
        dev_kfree_skb(skb);
@@ -692,6 +701,7 @@ static void hostap_ap_tx_cb_assoc(struct sk_buff *skb, int ok, void *data)
        u16 fc, *pos, status;
        struct sta_info *sta = NULL;
        char *txt = NULL;
+        DECLARE_MAC_BUF(mac);
        if (ap->local->hostapd) {
                dev_kfree_skb(skb);
@@ -742,8 +752,8 @@ static void hostap_ap_tx_cb_assoc(struct sk_buff *skb, int ok, void *data)
        if (sta)
                atomic_dec(&sta->users);
        if (txt) {
-                PDEBUG(DEBUG_AP, "%s: " MACSTR " assoc_cb - %s\n",
+                PDEBUG(DEBUG_AP, "%s: %s assoc_cb - %s\n",
-                       dev->name, MAC2STR(hdr->addr1), txt);
+                       dev->name, print_mac(mac, hdr->addr1), txt);
        }
        dev_kfree_skb(skb);
 }
@@ -755,6 +765,7 @@ static void hostap_ap_tx_cb_poll(struct sk_buff *skb, int ok, void *data)
        struct ap_data *ap = data;
        struct ieee80211_hdr_4addr *hdr;
        struct sta_info *sta;
+        DECLARE_MAC_BUF(mac);
        if (skb->len < 24)
                goto fail;
@@ -766,9 +777,9 @@ static void hostap_ap_tx_cb_poll(struct sk_buff *skb, int ok, void *data)
                        sta->flags &= ~WLAN_STA_PENDING_POLL;
                spin_unlock(&ap->sta_table_lock);
        } else {
-                PDEBUG(DEBUG_AP, "%s: STA " MACSTR " did not ACK activity "
+                PDEBUG(DEBUG_AP, "%s: STA %s"
-                       "poll frame\n", ap->local->dev->name,
+                       " did not ACK activity poll frame\n",
-                       MAC2STR(hdr->addr1));
+                       ap->local->dev->name, print_mac(mac, hdr->addr1));
        }
 fail:
@@ -985,6 +996,7 @@ static int prism2_sta_proc_read(char *page, char **start, off_t off,
        char *p = page;
        struct sta_info *sta = (struct sta_info *) data;
        int i;
+        DECLARE_MAC_BUF(mac);
        /* FIX: possible race condition.. the STA data could have just expired,
         * but proc entry was still here so that the read could have started;
@@ -995,11 +1007,11 @@ static int prism2_sta_proc_read(char *page, char **start, off_t off,
                return 0;
        }
-        p += sprintf(p, "%s=" MACSTR "\nusers=%d\naid=%d\n"
+        p += sprintf(p, "%s=%s\nusers=%d\naid=%d\n"
                     "flags=0x%04x%s%s%s%s%s%s%s\n"
                     "capability=0x%02x\nlisten_interval=%d\nsupported_rates=",
                     sta->ap ? "AP" : "STA",
-                     MAC2STR(sta->addr), atomic_read(&sta->users), sta->aid,
+                     print_mac(mac, sta->addr), atomic_read(&sta->users), sta->aid,
                     sta->flags,
                     sta->flags & WLAN_STA_AUTH ? " AUTH" : "",
                     sta->flags & WLAN_STA_ASSOC ? " ASSOC" : "",
@@ -1060,6 +1072,7 @@ static void handle_add_proc_queue(struct work_struct *work)
        struct sta_info *sta;
        char name[20];
        struct add_sta_proc_data *entry, *prev;
+        DECLARE_MAC_BUF(mac);
        entry = ap->add_sta_proc_entries;
        ap->add_sta_proc_entries = NULL;
@@ -1072,7 +1085,7 @@ static void handle_add_proc_queue(struct work_struct *work)
                spin_unlock_bh(&ap->sta_table_lock);
                if (sta) {
-                        sprintf(name, MACSTR, MAC2STR(sta->addr));
+                        sprintf(name, "%s", print_mac(mac, sta->addr));
                        sta->proc = create_proc_read_entry(
                                name, 0, ap->proc,
                                prism2_sta_proc_read, sta);
@@ -1290,6 +1303,7 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb,
        struct sta_info *sta = NULL;
        struct ieee80211_crypt_data *crypt;
        char *txt = "";
+        DECLARE_MAC_BUF(mac);
        len = skb->len - IEEE80211_MGMT_HDR_LEN;
@@ -1298,8 +1312,8 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb,
        if (len < 6) {
                PDEBUG(DEBUG_AP, "%s: handle_authen - too short payload "
-                       "(len=%d) from " MACSTR "\n", dev->name, len,
+                       "(len=%d) from %s\n", dev->name, len,
-                       MAC2STR(hdr->addr2));
+                       print_mac(mac, hdr->addr2));
                return;
        }
@@ -1364,8 +1378,8 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb,
                if (time_after(jiffies, sta->u.ap.last_beacon +
                               (10 * sta->listen_interval * HZ) / 1024)) {
                        PDEBUG(DEBUG_AP, "%s: no beacons received for a while,"
-                               " assuming AP " MACSTR " is now STA\n",
+                               " assuming AP %s is now STA\n",
-                               dev->name, MAC2STR(sta->addr));
+                               dev->name, print_mac(mac, sta->addr));
                        sta->ap = 0;
                        sta->flags = 0;
                        sta->u.sta.challenge = NULL;
@@ -1480,9 +1494,9 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb,
        }
        if (resp) {
-                PDEBUG(DEBUG_AP, "%s: " MACSTR " auth (alg=%d trans#=%d "
+                PDEBUG(DEBUG_AP, "%s: %s auth (alg=%d "
-                       "stat=%d len=%d fc=%04x) ==> %d (%s)\n",
+                       "trans#=%d stat=%d len=%d fc=%04x) ==> %d (%s)\n",
-                       dev->name, MAC2STR(hdr->addr2), auth_alg,
+                       dev->name, print_mac(mac, hdr->addr2), auth_alg,
                       auth_transaction, status_code, len, fc, resp, txt);
        }
 }
@@ -1502,13 +1516,14 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb,
        int send_deauth = 0;
        char *txt = "";
        u8 prev_ap[ETH_ALEN];
+        DECLARE_MAC_BUF(mac);
        left = len = skb->len - IEEE80211_MGMT_HDR_LEN;
        if (len < (reassoc ? 10 : 4)) {
                PDEBUG(DEBUG_AP, "%s: handle_assoc - too short payload "
-                       "(len=%d, reassoc=%d) from " MACSTR "\n",
+                       "(len=%d, reassoc=%d) from %s\n",
-                       dev->name, len, reassoc, MAC2STR(hdr->addr2));
+                       dev->name, len, reassoc, print_mac(mac, hdr->addr2));
                return;
        }
@@ -1585,9 +1600,9 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb,
                }
                if (left > 0) {
-                        PDEBUG(DEBUG_AP, "%s: assoc from " MACSTR " with extra"
+                        PDEBUG(DEBUG_AP, "%s: assoc from %s"
-                               " data (%d bytes) [",
+                               " with extra data (%d bytes) [",
-                               dev->name, MAC2STR(hdr->addr2), left);
+                               dev->name, print_mac(mac, hdr->addr2), left);
                        while (left > 0) {
                                PDEBUG2(DEBUG_AP, "<%02x>", *u);
                                u++; left--;
@@ -1687,10 +1702,10 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb,
        }
 #if 0
-        PDEBUG(DEBUG_AP, "%s: " MACSTR " %sassoc (len=%d prev_ap=" MACSTR
+        PDEBUG(DEBUG_AP, "%s: %s %sassoc (len=%d "
-               ") => %d(%d) (%s)\n",
+               "prev_ap=%s) => %d(%d) (%s)\n",
-               dev->name, MAC2STR(hdr->addr2), reassoc ? "re" : "", len,
+               dev->name, print_mac(mac, hdr->addr2), reassoc ? "re" : "", len,
-               MAC2STR(prev_ap), resp, send_deauth, txt);
+               print_mac(mac, prev_ap), resp, send_deauth, txt);
 #endif
 }
@@ -1705,6 +1720,7 @@ static void handle_deauth(local_info_t *local, struct sk_buff *skb,
        int len;
        u16 reason_code, *pos;
        struct sta_info *sta = NULL;
+        DECLARE_MAC_BUF(mac);
        len = skb->len - IEEE80211_MGMT_HDR_LEN;
@@ -1716,8 +1732,8 @@ static void handle_deauth(local_info_t *local, struct sk_buff *skb,
        pos = (u16 *) body;
        reason_code = __le16_to_cpu(*pos);
-        PDEBUG(DEBUG_AP, "%s: deauthentication: " MACSTR " len=%d, "
+        PDEBUG(DEBUG_AP, "%s: deauthentication: %s len=%d, "
-               "reason_code=%d\n", dev->name, MAC2STR(hdr->addr2), len,
+               "reason_code=%d\n", dev->name, print_mac(mac, hdr->addr2), len,
               reason_code);
        spin_lock_bh(&local->ap->sta_table_lock);
@@ -1729,9 +1745,9 @@ static void handle_deauth(local_info_t *local, struct sk_buff *skb,
        }
        spin_unlock_bh(&local->ap->sta_table_lock);
        if (sta == NULL) {
-                printk("%s: deauthentication from " MACSTR ", "
+                printk("%s: deauthentication from %s, "
               "reason_code=%d, but STA not authenticated\n", dev->name,
-                       MAC2STR(hdr->addr2), reason_code);
+                       print_mac(mac, hdr->addr2), reason_code);
        }
 }
@@ -1746,6 +1762,7 @@ static void handle_disassoc(local_info_t *local, struct sk_buff *skb,
        int len;
        u16 reason_code, *pos;
        struct sta_info *sta = NULL;
+        DECLARE_MAC_BUF(mac);
        len = skb->len - IEEE80211_MGMT_HDR_LEN;
@@ -1757,8 +1774,8 @@ static void handle_disassoc(local_info_t *local, struct sk_buff *skb,
        pos = (u16 *) body;
        reason_code = __le16_to_cpu(*pos);
-        PDEBUG(DEBUG_AP, "%s: disassociation: " MACSTR " len=%d, "
+        PDEBUG(DEBUG_AP, "%s: disassociation: %s len=%d, "
-               "reason_code=%d\n", dev->name, MAC2STR(hdr->addr2), len,
+               "reason_code=%d\n", dev->name, print_mac(mac, hdr->addr2), len,
               reason_code);
        spin_lock_bh(&local->ap->sta_table_lock);
@@ -1770,9 +1787,9 @@ static void handle_disassoc(local_info_t *local, struct sk_buff *skb,
        }
        spin_unlock_bh(&local->ap->sta_table_lock);
        if (sta == NULL) {
-                printk("%s: disassociation from " MACSTR ", "
+                printk("%s: disassociation from %s, "
                       "reason_code=%d, but STA not authenticated\n",
-                       dev->name, MAC2STR(hdr->addr2), reason_code);
+                       dev->name, print_mac(mac, hdr->addr2), reason_code);
        }
 }
@@ -1862,15 +1879,16 @@ static void handle_pspoll(local_info_t *local,
        struct sta_info *sta;
        u16 aid;
        struct sk_buff *skb;
+        DECLARE_MAC_BUF(mac);
-        PDEBUG(DEBUG_PS2, "handle_pspoll: BSSID=" MACSTR ", TA=" MACSTR
+        PDEBUG(DEBUG_PS2, "handle_pspoll: BSSID=%s"
-               " PWRMGT=%d\n",
+               ", TA=%s PWRMGT=%d\n",
-               MAC2STR(hdr->addr1), MAC2STR(hdr->addr2),
+               print_mac(mac, hdr->addr1), print_mac(mac, hdr->addr2),
               !!(le16_to_cpu(hdr->frame_ctl) & IEEE80211_FCTL_PM));
        if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) {
-                PDEBUG(DEBUG_AP, "handle_pspoll - addr1(BSSID)=" MACSTR
+                PDEBUG(DEBUG_AP, "handle_pspoll - addr1(BSSID)=%s"
-                       " not own MAC\n", MAC2STR(hdr->addr1));
+                       " not own MAC\n", print_mac(mac, hdr->addr1));
                return;
        }
@@ -1948,6 +1966,7 @@ static void handle_wds_oper_queue(struct work_struct *work)
                                          wds_oper_queue);
        local_info_t *local = ap->local;
        struct wds_oper_data *entry, *prev;
+        DECLARE_MAC_BUF(mac);
        spin_lock_bh(&local->lock);
        entry = local->ap->wds_oper_entries;
@@ -1956,10 +1975,10 @@ static void handle_wds_oper_queue(struct work_struct *work)
        while (entry) {
                PDEBUG(DEBUG_AP, "%s: %s automatic WDS connection "
-                       "to AP " MACSTR "\n",
+                       "to AP %s\n",
                       local->dev->name,
                       entry->type == WDS_ADD ? "adding" : "removing",
-                       MAC2STR(entry->addr));
+                       print_mac(mac, entry->addr));
                if (entry->type == WDS_ADD)
                        prism2_wds_add(local, entry->addr, 0);
                else if (entry->type == WDS_DEL)
@@ -2135,6 +2154,7 @@ static void handle_ap_item(local_info_t *local, struct sk_buff *skb,
 #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
        u16 fc, type, stype;
        struct ieee80211_hdr_4addr *hdr;
+        DECLARE_MAC_BUF(mac);
        /* FIX: should give skb->len to handler functions and check that the
         * buffer is long enough */
@@ -2163,8 +2183,8 @@ static void handle_ap_item(local_info_t *local, struct sk_buff *skb,
                if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) {
                        PDEBUG(DEBUG_AP, "handle_ap_item - addr1(BSSID)="
-                               MACSTR " not own MAC\n",
+                               "%s not own MAC\n",
-                               MAC2STR(hdr->addr1));
+                               print_mac(mac, hdr->addr1));
                        goto done;
                }
@@ -2200,14 +2220,14 @@ static void handle_ap_item(local_info_t *local, struct sk_buff *skb,
        }
        if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) {
-                PDEBUG(DEBUG_AP, "handle_ap_item - addr1(DA)=" MACSTR
+                PDEBUG(DEBUG_AP, "handle_ap_item - addr1(DA)=%s"
-                       " not own MAC\n", MAC2STR(hdr->addr1));
+                       " not own MAC\n", print_mac(mac, hdr->addr1));
                goto done;
        }
        if (memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN)) {
-                PDEBUG(DEBUG_AP, "handle_ap_item - addr3(BSSID)=" MACSTR
+                PDEBUG(DEBUG_AP, "handle_ap_item - addr3(BSSID)=%s"
-                       " not own MAC\n", MAC2STR(hdr->addr3));
+                       " not own MAC\n", print_mac(mac, hdr->addr3));
                goto done;
        }
@@ -2288,6 +2308,7 @@ static void schedule_packet_send(local_info_t *local, struct sta_info *sta)
        struct sk_buff *skb;
        struct ieee80211_hdr_4addr *hdr;
        struct hostap_80211_rx_status rx_stats;
+        DECLARE_MAC_BUF(mac);
        if (skb_queue_empty(&sta->tx_buf))
                return;
@@ -2308,8 +2329,8 @@ static void schedule_packet_send(local_info_t *local, struct sta_info *sta)
        memcpy(hdr->addr2, sta->addr, ETH_ALEN);
        hdr->duration_id = cpu_to_le16(sta->aid | BIT(15) | BIT(14));
-        PDEBUG(DEBUG_PS2, "%s: Scheduling buffered packet delivery for "
+        PDEBUG(DEBUG_PS2, "%s: Scheduling buffered packet delivery for STA "
-               "STA " MACSTR "\n", local->dev->name, MAC2STR(sta->addr));
+               "%s\n", local->dev->name, print_mac(mac, sta->addr));
        skb->dev = local->dev;
@@ -2636,6 +2657,7 @@ static int ap_update_sta_tx_rate(struct sta_info *sta, struct net_device *dev)
        int ret = sta->tx_rate;
        struct hostap_interface *iface;
        local_info_t *local;
+        DECLARE_MAC_BUF(mac);
        iface = netdev_priv(dev);
        local = iface->local;
@@ -2663,9 +2685,9 @@ static int ap_update_sta_tx_rate(struct sta_info *sta, struct net_device *dev)
                        case 3: sta->tx_rate = 110; break;
                        default: sta->tx_rate = 0; break;
                        }
-                        PDEBUG(DEBUG_AP, "%s: STA " MACSTR " TX rate raised to"
+                        PDEBUG(DEBUG_AP, "%s: STA %s"
-                               " %d\n", dev->name, MAC2STR(sta->addr),
+                               " TX rate raised to %d\n",
-                               sta->tx_rate);
+                               dev->name, print_mac(mac, sta->addr), sta->tx_rate);
                }
                sta->tx_since_last_failure = 0;
        }
@@ -2683,6 +2705,7 @@ ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx)
        int set_tim, ret;
        struct ieee80211_hdr_4addr *hdr;
        struct hostap_skb_tx_data *meta;
+        DECLARE_MAC_BUF(mac);
        meta = (struct hostap_skb_tx_data *) skb->cb;
        ret = AP_TX_CONTINUE;
@@ -2718,7 +2741,8 @@ ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx)
                 * print out any errors here. */
                if (net_ratelimit()) {
                        printk(KERN_DEBUG "AP: drop packet to non-associated "
-                               "STA " MACSTR "\n", MAC2STR(hdr->addr1));
+                               "STA %s\n",
+                               print_mac(mac, hdr->addr1));
                }
 #endif
                local->ap->tx_drop_nonassoc++;
@@ -2756,8 +2780,9 @@ ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx)
        }
        if (skb_queue_len(&sta->tx_buf) >= STA_MAX_TX_BUFFER) {
-                PDEBUG(DEBUG_PS, "%s: No more space in STA (" MACSTR ")'s PS "
+                PDEBUG(DEBUG_PS, "%s: No more space in STA (%s"
-                       "mode buffer\n", local->dev->name, MAC2STR(sta->addr));
+                       ")'s PS mode buffer\n",
+                       local->dev->name, print_mac(mac, sta->addr));
                /* Make sure that TIM is set for the station (it might not be
                 * after AP wlan hw reset). */
                /* FIX: should fix hw reset to restore bits based on STA
@@ -2821,6 +2846,7 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb)
        struct sta_info *sta;
        struct ieee80211_hdr_4addr *hdr;
        struct hostap_skb_tx_data *meta;
+        DECLARE_MAC_BUF(mac);
        hdr = (struct ieee80211_hdr_4addr *) skb->data;
        meta = (struct hostap_skb_tx_data *) skb->cb;
@@ -2829,9 +2855,9 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb)
        sta = ap_get_sta(local->ap, hdr->addr1);
        if (!sta) {
                spin_unlock(&local->ap->sta_table_lock);
-                PDEBUG(DEBUG_AP, "%s: Could not find STA " MACSTR " for this "
+                PDEBUG(DEBUG_AP, "%s: Could not find STA %s"
-                       "TX error (@%lu)\n",
+                       " for this TX error (@%lu)\n",
-                       local->dev->name, MAC2STR(hdr->addr1), jiffies);
+                       local->dev->name, print_mac(mac, hdr->addr1), jiffies);
                return;
        }
@@ -2858,8 +2884,9 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb)
                        case 3: sta->tx_rate = 110; break;
                        default: sta->tx_rate = 0; break;
                        }
-                        PDEBUG(DEBUG_AP, "%s: STA " MACSTR " TX rate lowered "
+                        PDEBUG(DEBUG_AP, "%s: STA %s"
-                               "to %d\n", local->dev->name, MAC2STR(sta->addr),
+                               " TX rate lowered to %d\n",
+                               local->dev->name, print_mac(mac, sta->addr),
                               sta->tx_rate);
                }
                sta->tx_consecutive_exc = 0;
@@ -2871,16 +2898,17 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb)
 static void hostap_update_sta_ps2(local_info_t *local, struct sta_info *sta,
                                  int pwrmgt, int type, int stype)
 {
+        DECLARE_MAC_BUF(mac);
        if (pwrmgt && !(sta->flags & WLAN_STA_PS)) {
                sta->flags |= WLAN_STA_PS;
-                PDEBUG(DEBUG_PS2, "STA " MACSTR " changed to use PS "
+                PDEBUG(DEBUG_PS2, "STA %s changed to use PS "
                       "mode (type=0x%02X, stype=0x%02X)\n",
-                       MAC2STR(sta->addr), type >> 2, stype >> 4);
+                       print_mac(mac, sta->addr), type >> 2, stype >> 4);
        } else if (!pwrmgt && (sta->flags & WLAN_STA_PS)) {
                sta->flags &= ~WLAN_STA_PS;
-                PDEBUG(DEBUG_PS2, "STA " MACSTR " changed to not use "
+                PDEBUG(DEBUG_PS2, "STA %s changed to not use "
                       "PS mode (type=0x%02X, stype=0x%02X)\n",
-                       MAC2STR(sta->addr), type >> 2, stype >> 4);
+                       print_mac(mac, sta->addr), type >> 2, stype >> 4);
                if (type != IEEE80211_FTYPE_CTL ||
                    stype != IEEE80211_STYPE_PSPOLL)
                        schedule_packet_send(local, sta);
@@ -2924,6 +2952,7 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
        struct sta_info *sta;
        u16 fc, type, stype;
        struct ieee80211_hdr_4addr *hdr;
+        DECLARE_MAC_BUF(mac);
        if (local->ap == NULL)
                return AP_RX_CONTINUE;
@@ -2954,9 +2983,10 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
 #ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
                        } else {
                                printk(KERN_DEBUG "%s: dropped received packet"
-                                       " from non-associated STA " MACSTR
+                                       " from non-associated STA "
+                                       "%s"
                                       " (type=0x%02x, subtype=0x%02x)\n",
-                                       dev->name, MAC2STR(hdr->addr2),
+                                       dev->name, print_mac(mac, hdr->addr2),
                                       type >> 2, stype >> 4);
                                hostap_rx(dev, skb, rx_stats);
 #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
@@ -2991,8 +3021,8 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
                         * being associated. */
                        printk(KERN_DEBUG "%s: rejected received nullfunc "
                               "frame without ToDS from not associated STA "
-                               MACSTR "\n",
+                               "%s\n",
-                               dev->name, MAC2STR(hdr->addr2));
+                               dev->name, print_mac(mac, hdr->addr2));
                        hostap_rx(dev, skb, rx_stats);
 #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
                }
@@ -3009,9 +3039,9 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
                 * If BSSID is own, report the dropping of this frame. */
                if (memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN) == 0) {
                        printk(KERN_DEBUG "%s: dropped received packet from "
-                               MACSTR " with no ToDS flag (type=0x%02x, "
+                               "%s with no ToDS flag "
-                               "subtype=0x%02x)\n", dev->name,
+                               "(type=0x%02x, subtype=0x%02x)\n", dev->name,
-                               MAC2STR(hdr->addr2), type >> 2, stype >> 4);
+                               print_mac(mac, hdr->addr2), type >> 2, stype >> 4);
                        hostap_dump_rx_80211(dev->name, skb, rx_stats);
                }
                ret = AP_RX_DROP;
diff --git a/drivers/net/wireless/hostap/hostap_common.h b/drivers/net/wireless/hostap/hostap_common.h
index b31e6a05f23c..ceb7f1e5e9e0 100644
--- a/drivers/net/wireless/hostap/hostap_common.h
+++ b/drivers/net/wireless/hostap/hostap_common.h
@@ -6,9 +6,6 @@
 #define BIT(x) (1 << (x))
-#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
-#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
 /* IEEE 802.11 defines */
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index adedb9716542..7fa7ab0a4b23 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -2335,6 +2335,10 @@ static void prism2_txexc(local_info_t *local)
        int show_dump, res;
        char *payload = NULL;
        struct hfa384x_tx_frame txdesc;
+        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mac2);
+        DECLARE_MAC_BUF(mac3);
+        DECLARE_MAC_BUF(mac4);
        show_dump = local->frame_dump & PRISM2_DUMP_TXEXC_HDR;
        local->stats.tx_errors++;
@@ -2400,10 +2404,9 @@ static void prism2_txexc(local_info_t *local)
               WLAN_FC_GET_STYPE(fc) >> 4,
               fc & IEEE80211_FCTL_TODS ? " ToDS" : "",
               fc & IEEE80211_FCTL_FROMDS ? " FromDS" : "");
-        PDEBUG(DEBUG_EXTRA, "   A1=" MACSTR " A2=" MACSTR " A3="
+        PDEBUG(DEBUG_EXTRA, "   A1=%s A2=%s A3=%s A4=%s\n",
-               MACSTR " A4=" MACSTR "\n",
+               print_mac(mac, txdesc.addr1), print_mac(mac2, txdesc.addr2),
-               MAC2STR(txdesc.addr1), MAC2STR(txdesc.addr2),
+               print_mac(mac3, txdesc.addr3), print_mac(mac4, txdesc.addr4));
-               MAC2STR(txdesc.addr3), MAC2STR(txdesc.addr4));
 }
diff --git a/drivers/net/wireless/hostap/hostap_info.c b/drivers/net/wireless/hostap/hostap_info.c
index b6a02a02da74..636f4b2382ea 100644
--- a/drivers/net/wireless/hostap/hostap_info.c
+++ b/drivers/net/wireless/hostap/hostap_info.c
@@ -166,6 +166,7 @@ static void prism2_host_roaming(local_info_t *local)
        struct hfa384x_hostscan_result *selected, *entry;
        int i;
        unsigned long flags;
+        DECLARE_MAC_BUF(mac);
        if (local->last_join_time &&
            time_before(jiffies, local->last_join_time + 10 * HZ)) {
@@ -198,8 +199,9 @@ static void prism2_host_roaming(local_info_t *local)
            local->preferred_ap[2] || local->preferred_ap[3] ||
            local->preferred_ap[4] || local->preferred_ap[5]) {
                /* Try to find preferred AP */
-                PDEBUG(DEBUG_EXTRA, "%s: Preferred AP BSSID " MACSTR "\n",
+                PDEBUG(DEBUG_EXTRA, "%s: Preferred AP BSSID "
-                       dev->name, MAC2STR(local->preferred_ap));
+                       "%s\n",
+                       dev->name, print_mac(mac, local->preferred_ap));
                for (i = 0; i < local->last_scan_results_count; i++) {
                        entry = &local->last_scan_results[i];
                        if (memcmp(local->preferred_ap, entry->bssid, 6) == 0)
@@ -216,8 +218,9 @@ static void prism2_host_roaming(local_info_t *local)
        req.channel = selected->chid;
        spin_unlock_irqrestore(&local->lock, flags);
-        PDEBUG(DEBUG_EXTRA, "%s: JoinRequest: BSSID=" MACSTR " channel=%d\n",
+        PDEBUG(DEBUG_EXTRA, "%s: JoinRequest: BSSID=%s"
-               dev->name, MAC2STR(req.bssid), le16_to_cpu(req.channel));
+               " channel=%d\n",
+               dev->name, print_mac(mac, req.bssid), le16_to_cpu(req.channel));
        if (local->func->set_rid(dev, HFA384X_RID_JOINREQUEST, &req,
                                 sizeof(req))) {
                printk(KERN_DEBUG "%s: JoinRequest failed\n", dev->name);
@@ -409,6 +412,7 @@ static void handle_info_queue_linkstatus(local_info_t *local)
        int val = local->prev_link_status;
        int connected;
        union iwreq_data wrqu;
+        DECLARE_MAC_BUF(mac);
        connected =
                val == HFA384X_LINKSTATUS_CONNECTED ||
@@ -420,9 +424,10 @@ static void handle_info_queue_linkstatus(local_info_t *local)
                printk(KERN_DEBUG "%s: could not read CURRENTBSSID after "
                       "LinkStatus event\n", local->dev->name);
        } else {
-                PDEBUG(DEBUG_EXTRA, "%s: LinkStatus: BSSID=" MACSTR "\n",
+                PDEBUG(DEBUG_EXTRA, "%s: LinkStatus: BSSID="
+                       "%s\n",
                       local->dev->name,
-                       MAC2STR((unsigned char *) local->bssid));
+                       print_mac(mac, (unsigned char *) local->bssid));
                if (local->wds_type & HOSTAP_WDS_AP_CLIENT)
                        hostap_add_sta(local->ap, local->bssid);
        }
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index 730b3541e325..7036ecff5ec1 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -664,6 +664,7 @@ static int hostap_join_ap(struct net_device *dev)
        unsigned long flags;
        int i;
        struct hfa384x_hostscan_result *entry;
+        DECLARE_MAC_BUF(mac);
        iface = netdev_priv(dev);
        local = iface->local;
@@ -685,14 +686,14 @@ static int hostap_join_ap(struct net_device *dev)
        if (local->func->set_rid(dev, HFA384X_RID_JOINREQUEST, &req,
                                 sizeof(req))) {
-                printk(KERN_DEBUG "%s: JoinRequest " MACSTR
+                printk(KERN_DEBUG "%s: JoinRequest %s"
                       " failed\n",
-                       dev->name, MAC2STR(local->preferred_ap));
+                       dev->name, print_mac(mac, local->preferred_ap));
                return -1;
        }
-        printk(KERN_DEBUG "%s: Trying to join BSSID " MACSTR "\n",
+        printk(KERN_DEBUG "%s: Trying to join BSSID %s\n",
-               dev->name, MAC2STR(local->preferred_ap));
+               dev->name, print_mac(mac, local->preferred_ap));
        return 0;
 }
@@ -3697,8 +3698,10 @@ static int prism2_ioctl_set_assoc_ap_addr(local_info_t *local,
                                          struct prism2_hostapd_param *param,
                                          int param_len)
 {
-        printk(KERN_DEBUG "%ssta: associated as client with AP " MACSTR "\n",
+        DECLARE_MAC_BUF(mac);
-               local->dev->name, MAC2STR(param->sta_addr));
+        printk(KERN_DEBUG "%ssta: associated as client with AP "
+               "%s\n",
+               local->dev->name, print_mac(mac, param->sta_addr));
        memcpy(local->assoc_ap_addr, param->sta_addr, ETH_ALEN);
        return 0;
 }
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 9a470e80ca24..4cb09d81b404 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -530,6 +530,10 @@ int hostap_set_auth_algs(local_info_t *local)
 void hostap_dump_rx_header(const char *name, const struct hfa384x_rx_frame *rx)
 {
        u16 status, fc;
+        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mac2);
+        DECLARE_MAC_BUF(mac3);
+        DECLARE_MAC_BUF(mac4);
        status = __le16_to_cpu(rx->status);
@@ -548,13 +552,12 @@ void hostap_dump_rx_header(const char *name, const struct hfa384x_rx_frame *rx)
               fc & IEEE80211_FCTL_TODS ? " [ToDS]" : "",
               fc & IEEE80211_FCTL_FROMDS ? " [FromDS]" : "");
-        printk(KERN_DEBUG "   A1=" MACSTR " A2=" MACSTR " A3=" MACSTR " A4="
+        printk(KERN_DEBUG "   A1=%s A2=%s A3=%s A4=%s\n",
-               MACSTR "\n",
+               print_mac(mac, rx->addr1), print_mac(mac2, rx->addr2),
-               MAC2STR(rx->addr1), MAC2STR(rx->addr2), MAC2STR(rx->addr3),
+               print_mac(mac3, rx->addr3), print_mac(mac4, rx->addr4));
-               MAC2STR(rx->addr4));
-        printk(KERN_DEBUG "   dst=" MACSTR " src=" MACSTR " len=%d\n",
+        printk(KERN_DEBUG "   dst=%s src=%s len=%d\n",
-               MAC2STR(rx->dst_addr), MAC2STR(rx->src_addr),
+               print_mac(mac, rx->dst_addr), print_mac(mac2, rx->src_addr),
               __be16_to_cpu(rx->len));
 }
@@ -562,6 +565,10 @@ void hostap_dump_rx_header(const char *name, const struct hfa384x_rx_frame *rx)
 void hostap_dump_tx_header(const char *name, const struct hfa384x_tx_frame *tx)
 {
        u16 fc;
+        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mac2);
+        DECLARE_MAC_BUF(mac3);
+        DECLARE_MAC_BUF(mac4);
        printk(KERN_DEBUG "%s: TX status=0x%04x retry_count=%d tx_rate=%d "
               "tx_control=0x%04x; jiffies=%ld\n",
@@ -577,13 +584,12 @@ void hostap_dump_tx_header(const char *name, const struct hfa384x_tx_frame *tx)
               fc & IEEE80211_FCTL_TODS ? " [ToDS]" : "",
               fc & IEEE80211_FCTL_FROMDS ? " [FromDS]" : "");
-        printk(KERN_DEBUG "   A1=" MACSTR " A2=" MACSTR " A3=" MACSTR " A4="
+        printk(KERN_DEBUG "   A1=%s A2=%s A3=%s A4=%s\n",
-               MACSTR "\n",
+               print_mac(mac, tx->addr1), print_mac(mac2, tx->addr2),
-               MAC2STR(tx->addr1), MAC2STR(tx->addr2), MAC2STR(tx->addr3),
+               print_mac(mac3, tx->addr3), print_mac(mac4, tx->addr4));
-               MAC2STR(tx->addr4));
-        printk(KERN_DEBUG "   dst=" MACSTR " src=" MACSTR " len=%d\n",
+        printk(KERN_DEBUG "   dst=%s src=%s len=%d\n",
-               MAC2STR(tx->dst_addr), MAC2STR(tx->src_addr),
+               print_mac(mac, tx->dst_addr), print_mac(mac2, tx->src_addr),
               __be16_to_cpu(tx->len));
 }
diff --git a/drivers/net/wireless/hostap/hostap_proc.c b/drivers/net/wireless/hostap/hostap_proc.c
index d1d8ce022e63..b03536008ad9 100644
--- a/drivers/net/wireless/hostap/hostap_proc.c
+++ b/drivers/net/wireless/hostap/hostap_proc.c
@@ -106,6 +106,7 @@ static int prism2_wds_proc_read(char *page, char **start, off_t off,
        local_info_t *local = (local_info_t *) data;
        struct list_head *ptr;
        struct hostap_interface *iface;
+        DECLARE_MAC_BUF(mac);
        if (off > PROC_LIMIT) {
                *eof = 1;
@@ -117,9 +118,9 @@ static int prism2_wds_proc_read(char *page, char **start, off_t off,
                iface = list_entry(ptr, struct hostap_interface, list);
                if (iface->type != HOSTAP_INTERFACE_WDS)
                        continue;
-                p += sprintf(p, "%s\t" MACSTR "\n",
+                p += sprintf(p, "%s\t%s\n",
                             iface->dev->name,
-                             MAC2STR(iface->u.wds.remote_addr));
+                             print_mac(mac, iface->u.wds.remote_addr));
                if ((p - page) > PROC_LIMIT) {
                        printk(KERN_DEBUG "%s: wds proc did not fit\n",
                               local->dev->name);
@@ -147,6 +148,7 @@ static int prism2_bss_list_proc_read(char *page, char **start, off_t off,
        struct list_head *ptr;
        struct hostap_bss_info *bss;
        int i;
+        DECLARE_MAC_BUF(mac);
        if (off > PROC_LIMIT) {
                *eof = 1;
@@ -158,8 +160,8 @@ static int prism2_bss_list_proc_read(char *page, char **start, off_t off,
        spin_lock_bh(&local->lock);
        list_for_each(ptr, &local->bss_list) {
                bss = list_entry(ptr, struct hostap_bss_info, list);
-                p += sprintf(p, MACSTR "\t%lu\t%u\t0x%x\t",
+                p += sprintf(p, "%s\t%lu\t%u\t0x%x\t",
-                             MAC2STR(bss->bssid), bss->last_update,
+                             print_mac(mac, bss->bssid), bss->last_update,
                             bss->count, bss->capab_info);
                for (i = 0; i < bss->ssid_len; i++) {
                        p += sprintf(p, "%c",
@@ -312,6 +314,7 @@ static int prism2_scan_results_proc_read(char *page, char **start, off_t off,
        int entry, i, len, total = 0;
        struct hfa384x_hostscan_result *scanres;
        u8 *pos;
+        DECLARE_MAC_BUF(mac);
        p += sprintf(p, "CHID ANL SL BcnInt Capab Rate BSSID ATIM SupRates "
                     "SSID\n");
@@ -329,14 +332,14 @@ static int prism2_scan_results_proc_read(char *page, char **start, off_t off,
                if ((p - page) > (PAGE_SIZE - 200))
                        break;
-                p += sprintf(p, "%d %d %d %d 0x%02x %d " MACSTR " %d ",
+                p += sprintf(p, "%d %d %d %d 0x%02x %d %s %d ",
                             le16_to_cpu(scanres->chid),
                             (s16) le16_to_cpu(scanres->anl),
                             (s16) le16_to_cpu(scanres->sl),
                             le16_to_cpu(scanres->beacon_interval),
                             le16_to_cpu(scanres->capability),
                             le16_to_cpu(scanres->rate),
-                             MAC2STR(scanres->bssid),
+                             print_mac(mac, scanres->bssid),
                             le16_to_cpu(scanres->atim));
                pos = scanres->sup_rates;
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index b3c07b93afce..2d46a16c0945 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -1922,6 +1922,7 @@ static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status)
        u32 chan;
        char *txratename;
        u8 bssid[ETH_ALEN];
+        DECLARE_MAC_BUF(mac);
        /*
         * TBD: BSSID is usually 00:00:00:00:00:00 here and not
@@ -1983,9 +1984,9 @@ static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status)
        }
        IPW_DEBUG_INFO("%s: Associated with '%s' at %s, channel %d (BSSID="
-                       MAC_FMT ")\n",
+                       "%s)\n",
                       priv->net_dev->name, escape_essid(essid, essid_len),
-                       txratename, chan, MAC_ARG(bssid));
+                       txratename, chan, print_mac(mac, bssid));
        /* now we copy read ssid into dev */
        if (!(priv->config & CFG_STATIC_ESSID)) {
@@ -2053,10 +2054,12 @@ static int ipw2100_set_essid(struct ipw2100_priv *priv, char *essid,
 static void isr_indicate_association_lost(struct ipw2100_priv *priv, u32 status)
 {
+        DECLARE_MAC_BUF(mac);
        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                  "disassociated: '%s' " MAC_FMT " \n",
+                  "disassociated: '%s' %s \n",
                  escape_essid(priv->essid, priv->essid_len),
-                  MAC_ARG(priv->bssid));
+                  print_mac(mac, priv->bssid));
        priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING);
@@ -4049,6 +4052,7 @@ static ssize_t show_bssinfo(struct device *d, struct device_attribute *attr,
        char *out = buf;
        int length;
        int ret;
+        DECLARE_MAC_BUF(mac);
        if (priv->status & STATUS_RF_KILL_MASK)
                return 0;
@@ -4076,9 +4080,7 @@ static ssize_t show_bssinfo(struct device *d, struct device_attribute *attr,
                               __LINE__);
        out += sprintf(out, "ESSID: %s\n", essid);
-        out += sprintf(out, "BSSID:   %02x:%02x:%02x:%02x:%02x:%02x\n",
+        out += sprintf(out, "BSSID:   %s\n", print_mac(mac, bssid));
-                       bssid[0], bssid[1], bssid[2],
-                       bssid[3], bssid[4], bssid[5]);
        out += sprintf(out, "Channel: %d\n", chan);
        return out - buf;
@@ -4652,19 +4654,20 @@ static void ipw2100_rx_free(struct ipw2100_priv *priv)
 static int ipw2100_read_mac_address(struct ipw2100_priv *priv)
 {
        u32 length = ETH_ALEN;
-        u8 mac[ETH_ALEN];
+        u8 addr[ETH_ALEN];
+        DECLARE_MAC_BUF(mac);
        int err;
-        err = ipw2100_get_ordinal(priv, IPW_ORD_STAT_ADAPTER_MAC, mac, &length);
+        err = ipw2100_get_ordinal(priv, IPW_ORD_STAT_ADAPTER_MAC, addr, &length);
        if (err) {
                IPW_DEBUG_INFO("MAC address read failed\n");
                return -EIO;
        }
-        IPW_DEBUG_INFO("card MAC is %02X:%02X:%02X:%02X:%02X:%02X\n",
-                       mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-        memcpy(priv->net_dev->dev_addr, mac, ETH_ALEN);
+        memcpy(priv->net_dev->dev_addr, addr, ETH_ALEN);
+        IPW_DEBUG_INFO("card MAC is %s\n",
+                       print_mac(mac, priv->net_dev->dev_addr));
        return 0;
 }
@@ -5043,10 +5046,10 @@ static int ipw2100_set_mandatory_bssid(struct ipw2100_priv *priv, u8 * bssid,
        int err;
 #ifdef CONFIG_IPW2100_DEBUG
+        DECLARE_MAC_BUF(mac);
        if (bssid != NULL)
-                IPW_DEBUG_HC("MANDATORY_BSSID: %02X:%02X:%02X:%02X:%02X:%02X\n",
+                IPW_DEBUG_HC("MANDATORY_BSSID: %s\n",
-                             bssid[0], bssid[1], bssid[2], bssid[3], bssid[4],
+                             print_mac(mac, bssid));
-                             bssid[5]);
        else
                IPW_DEBUG_HC("MANDATORY_BSSID: <clear>\n");
 #endif
@@ -6892,6 +6895,7 @@ static int ipw2100_wx_set_wap(struct net_device *dev,
        static const unsigned char off[] = {
                0x00, 0x00, 0x00, 0x00, 0x00, 0x00
        };
+        DECLARE_MAC_BUF(mac);
        // sanity checks
        if (wrqu->ap_addr.sa_family != ARPHRD_ETHER)
@@ -6917,13 +6921,8 @@ static int ipw2100_wx_set_wap(struct net_device *dev,
        err = ipw2100_set_mandatory_bssid(priv, wrqu->ap_addr.sa_data, 0);
-        IPW_DEBUG_WX("SET BSSID -> %02X:%02X:%02X:%02X:%02X:%02X\n",
+        IPW_DEBUG_WX("SET BSSID -> %s\n",
-                     wrqu->ap_addr.sa_data[0] & 0xff,
+                     print_mac(mac, wrqu->ap_addr.sa_data));
-                     wrqu->ap_addr.sa_data[1] & 0xff,
-                     wrqu->ap_addr.sa_data[2] & 0xff,
-                     wrqu->ap_addr.sa_data[3] & 0xff,
-                     wrqu->ap_addr.sa_data[4] & 0xff,
-                     wrqu->ap_addr.sa_data[5] & 0xff);
      done:
        mutex_unlock(&priv->action_mutex);
@@ -6939,6 +6938,7 @@ static int ipw2100_wx_get_wap(struct net_device *dev,
         */
        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        DECLARE_MAC_BUF(mac);
        /* If we are associated, trying to associate, or have a statically
         * configured BSSID then return that; otherwise return ANY */
@@ -6948,8 +6948,8 @@ static int ipw2100_wx_get_wap(struct net_device *dev,
        } else
                memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
-        IPW_DEBUG_WX("Getting WAP BSSID: " MAC_FMT "\n",
+        IPW_DEBUG_WX("Getting WAP BSSID: %s\n",
-                     MAC_ARG(wrqu->ap_addr.sa_data));
+                     print_mac(mac, wrqu->ap_addr.sa_data));
        return 0;
 }
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index afad8bb7e334..2119a79dcc86 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -2247,8 +2247,8 @@ static int ipw_send_adapter_address(struct ipw_priv *priv, u8 * mac)
                return -1;
        }
-        IPW_DEBUG_INFO("%s: Setting MAC to " MAC_FMT "\n",
+        IPW_DEBUG_INFO("%s: Setting MAC to %s\n",
-                       priv->net_dev->name, MAC_ARG(mac));
+                       priv->net_dev->name, print_mac(mac, mac));
        return ipw_send_cmd_pdu(priv, IPW_CMD_ADAPTER_ADDRESS, ETH_ALEN, mac);
 }
@@ -3796,6 +3796,7 @@ static u8 ipw_add_station(struct ipw_priv *priv, u8 * bssid)
 {
        struct ipw_station_entry entry;
        int i;
+        DECLARE_MAC_BUF(mac);
        for (i = 0; i < priv->num_stations; i++) {
                if (!memcmp(priv->stations[i], bssid, ETH_ALEN)) {
@@ -3812,7 +3813,7 @@ static u8 ipw_add_station(struct ipw_priv *priv, u8 * bssid)
        if (i == MAX_STATIONS)
                return IPW_INVALID_STATION;
-        IPW_DEBUG_SCAN("Adding AdHoc station: " MAC_FMT "\n", MAC_ARG(bssid));
+        IPW_DEBUG_SCAN("Adding AdHoc station: %s\n", print_mac(mac, bssid));
        entry.reserved = 0;
        entry.support_mode = 0;
@@ -3839,6 +3840,7 @@ static u8 ipw_find_station(struct ipw_priv *priv, u8 * bssid)
 static void ipw_send_disassociate(struct ipw_priv *priv, int quiet)
 {
        int err;
+        DECLARE_MAC_BUF(mac);
        if (priv->status & STATUS_ASSOCIATING) {
                IPW_DEBUG_ASSOC("Disassociating while associating.\n");
@@ -3851,9 +3853,9 @@ static void ipw_send_disassociate(struct ipw_priv *priv, int quiet)
                return;
        }
-        IPW_DEBUG_ASSOC("Disassocation attempt from " MAC_FMT " "
+        IPW_DEBUG_ASSOC("Disassocation attempt from %s "
                        "on channel %d.\n",
-                        MAC_ARG(priv->assoc_request.bssid),
+                        print_mac(mac, priv->assoc_request.bssid),
                        priv->assoc_request.channel);
        priv->status &= ~(STATUS_ASSOCIATING | STATUS_ASSOCIATED);
@@ -4348,6 +4350,7 @@ static void ipw_handle_missed_beacon(struct ipw_priv *priv,
 static void ipw_rx_notification(struct ipw_priv *priv,
                                       struct ipw_rx_notification *notif)
 {
+        DECLARE_MAC_BUF(mac);
        notif->size = le16_to_cpu(notif->size);
        IPW_DEBUG_NOTIF("type = %i (%d bytes)\n", notif->subtype, notif->size);
@@ -4360,11 +4363,11 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                        case CMAS_ASSOCIATED:{
                                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
                                                  IPW_DL_ASSOC,
-                                                  "associated: '%s' " MAC_FMT
+                                                  "associated: '%s' %s"
                                                  " \n",
                                                  escape_essid(priv->essid,
                                                               priv->essid_len),
-                                                  MAC_ARG(priv->bssid));
+                                                  print_mac(mac, priv->bssid));
                                        switch (priv->ieee->iw_mode) {
                                        case IW_MODE_INFRA:
@@ -4444,13 +4447,13 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                                                          IPW_DL_STATE |
                                                          IPW_DL_ASSOC,
                                                          "deauthenticated: '%s' "
-                                                          MAC_FMT
+                                                          "%s"
                                                          ": (0x%04X) - %s \n",
                                                          escape_essid(priv->
                                                                       essid,
                                                                       priv->
                                                                       essid_len),
-                                                          MAC_ARG(priv->bssid),
+                                                          print_mac(mac, priv->bssid),
                                                          ntohs(auth->status),
                                                          ipw_get_status_code
                                                          (ntohs
@@ -4467,11 +4470,11 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
                                                  IPW_DL_ASSOC,
-                                                  "authenticated: '%s' " MAC_FMT
+                                                  "authenticated: '%s' %s"
                                                  "\n",
                                                  escape_essid(priv->essid,
                                                               priv->essid_len),
-                                                  MAC_ARG(priv->bssid));
+                                                  print_mac(mac, priv->bssid));
                                        break;
                                }
@@ -4496,11 +4499,11 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
                                                  IPW_DL_ASSOC,
-                                                  "disassociated: '%s' " MAC_FMT
+                                                  "disassociated: '%s' %s"
                                                  " \n",
                                                  escape_essid(priv->essid,
                                                               priv->essid_len),
-                                                  MAC_ARG(priv->bssid));
+                                                  print_mac(mac, priv->bssid));
                                        priv->status &=
                                            ~(STATUS_DISASSOCIATING |
@@ -4535,10 +4538,10 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                        switch (auth->state) {
                        case CMAS_AUTHENTICATED:
                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,
-                                          "authenticated: '%s' " MAC_FMT " \n",
+                                          "authenticated: '%s' %s \n",
                                          escape_essid(priv->essid,
                                                       priv->essid_len),
-                                          MAC_ARG(priv->bssid));
+                                          print_mac(mac, priv->bssid));
                                priv->status |= STATUS_AUTH;
                                break;
@@ -4554,10 +4557,10 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                                }
                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
                                          IPW_DL_ASSOC,
-                                          "deauthenticated: '%s' " MAC_FMT "\n",
+                                          "deauthenticated: '%s' %s\n",
                                          escape_essid(priv->essid,
                                                       priv->essid_len),
-                                          MAC_ARG(priv->bssid));
+                                          print_mac(mac, priv->bssid));
                                priv->status &= ~(STATUS_ASSOCIATING |
                                                  STATUS_AUTH |
@@ -5383,25 +5386,27 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
                                  int roaming)
 {
        struct ipw_supported_rates rates;
+        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mac2);
        /* Verify that this network's capability is compatible with the
         * current mode (AdHoc or Infrastructure) */
        if ((priv->ieee->iw_mode == IW_MODE_ADHOC &&
             !(network->capability & WLAN_CAPABILITY_IBSS))) {
-                IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded due to "
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded due to "
                                "capability mismatch.\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                return 0;
        }
        /* If we do not have an ESSID for this AP, we can not associate with
         * it */
        if (network->flags & NETWORK_EMPTY_ESSID) {
-                IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
                                "because of hidden ESSID.\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                return 0;
        }
@@ -5411,11 +5416,11 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
                if ((network->ssid_len != match->network->ssid_len) ||
                    memcmp(network->ssid, match->network->ssid,
                           network->ssid_len)) {
-                        IPW_DEBUG_MERGE("Netowrk '%s (" MAC_FMT ")' excluded "
+                        IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
                                        "because of non-network ESSID.\n",
                                        escape_essid(network->ssid,
                                                     network->ssid_len),
-                                        MAC_ARG(network->bssid));
+                                        print_mac(mac, network->bssid));
                        return 0;
                }
        } else {
@@ -5430,9 +5435,9 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
                        strncpy(escaped,
                                escape_essid(network->ssid, network->ssid_len),
                                sizeof(escaped));
-                        IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
+                        IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
                                        "because of ESSID mismatch: '%s'.\n",
-                                        escaped, MAC_ARG(network->bssid),
+                                        escaped, print_mac(mac, network->bssid),
                                        escape_essid(priv->essid,
                                                     priv->essid_len));
                        return 0;
@@ -5459,10 +5464,10 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
        /* Now go through and see if the requested network is valid... */
        if (priv->ieee->scan_age != 0 &&
            time_after(jiffies, network->last_scanned + priv->ieee->scan_age)) {
-                IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
                                "because of age: %ums.\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid),
+                                print_mac(mac, network->bssid),
                                jiffies_to_msecs(jiffies -
                                                 network->last_scanned));
                return 0;
@@ -5470,10 +5475,10 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
        if ((priv->config & CFG_STATIC_CHANNEL) &&
            (network->channel != priv->channel)) {
-                IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
                                "because of channel mismatch: %d != %d.\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid),
+                                print_mac(mac, network->bssid),
                                network->channel, priv->channel);
                return 0;
        }
@@ -5481,10 +5486,10 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
        /* Verify privacy compatability */
        if (((priv->capability & CAP_PRIVACY_ON) ? 1 : 0) !=
            ((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) {
-                IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
                                "because of privacy mismatch: %s != %s.\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid),
+                                print_mac(mac, network->bssid),
                                priv->
                                capability & CAP_PRIVACY_ON ? "on" : "off",
                                network->
@@ -5494,40 +5499,41 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
        }
        if (!memcmp(network->bssid, priv->bssid, ETH_ALEN)) {
-                IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
-                                "because of the same BSSID match: " MAC_FMT
+                                "because of the same BSSID match: %s"
                                ".\n", escape_essid(network->ssid,
                                                    network->ssid_len),
-                                MAC_ARG(network->bssid), MAC_ARG(priv->bssid));
+                                print_mac(mac, network->bssid),
+                                print_mac(mac2, priv->bssid));
                return 0;
        }
        /* Filter out any incompatible freq / mode combinations */
        if (!ieee80211_is_valid_mode(priv->ieee, network->mode)) {
-                IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
                                "because of invalid frequency/mode "
                                "combination.\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                return 0;
        }
        /* Ensure that the rates supported by the driver are compatible with
         * this AP, including verification of basic rates (mandatory) */
        if (!ipw_compatible_rates(priv, network, &rates)) {
-                IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
                                "because configured rate mask excludes "
                                "AP mandatory rate.\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                return 0;
        }
        if (rates.num_rates == 0) {
-                IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
                                "because of no compatible rates.\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                return 0;
        }
@@ -5538,9 +5544,9 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
        /* Set up 'new' AP to this network */
        ipw_copy_rates(&match->rates, &rates);
        match->network = network;
-        IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' is a viable match.\n",
+        IPW_DEBUG_MERGE("Network '%s (%s)' is a viable match.\n",
                        escape_essid(network->ssid, network->ssid_len),
-                        MAC_ARG(network->bssid));
+                        print_mac(mac, network->bssid));
        return 1;
 }
@@ -5594,6 +5600,7 @@ static int ipw_best_network(struct ipw_priv *priv,
                            struct ieee80211_network *network, int roaming)
 {
        struct ipw_supported_rates rates;
+        DECLARE_MAC_BUF(mac);
        /* Verify that this network's capability is compatible with the
         * current mode (AdHoc or Infrastructure) */
@@ -5601,20 +5608,20 @@ static int ipw_best_network(struct ipw_priv *priv,
             !(network->capability & WLAN_CAPABILITY_ESS)) ||
            (priv->ieee->iw_mode == IW_MODE_ADHOC &&
             !(network->capability & WLAN_CAPABILITY_IBSS))) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded due to "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded due to "
                                "capability mismatch.\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                return 0;
        }
        /* If we do not have an ESSID for this AP, we can not associate with
         * it */
        if (network->flags & NETWORK_EMPTY_ESSID) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                "because of hidden ESSID.\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                return 0;
        }
@@ -5624,11 +5631,11 @@ static int ipw_best_network(struct ipw_priv *priv,
                if ((network->ssid_len != match->network->ssid_len) ||
                    memcmp(network->ssid, match->network->ssid,
                           network->ssid_len)) {
-                        IPW_DEBUG_ASSOC("Netowrk '%s (" MAC_FMT ")' excluded "
+                        IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                        "because of non-network ESSID.\n",
                                        escape_essid(network->ssid,
                                                     network->ssid_len),
-                                        MAC_ARG(network->bssid));
+                                        print_mac(mac, network->bssid));
                        return 0;
                }
        } else {
@@ -5642,9 +5649,9 @@ static int ipw_best_network(struct ipw_priv *priv,
                        strncpy(escaped,
                                escape_essid(network->ssid, network->ssid_len),
                                sizeof(escaped));
-                        IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                        IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                        "because of ESSID mismatch: '%s'.\n",
-                                        escaped, MAC_ARG(network->bssid),
+                                        escaped, print_mac(mac, network->bssid),
                                        escape_essid(priv->essid,
                                                     priv->essid_len));
                        return 0;
@@ -5658,12 +5665,12 @@ static int ipw_best_network(struct ipw_priv *priv,
                strncpy(escaped,
                        escape_essid(network->ssid, network->ssid_len),
                        sizeof(escaped));
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded because "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded because "
-                                "'%s (" MAC_FMT ")' has a stronger signal.\n",
+                                "'%s (%s)' has a stronger signal.\n",
-                                escaped, MAC_ARG(network->bssid),
+                                escaped, print_mac(mac, network->bssid),
                                escape_essid(match->network->ssid,
                                             match->network->ssid_len),
-                                MAC_ARG(match->network->bssid));
+                                print_mac(mac, match->network->bssid));
                return 0;
        }
@@ -5671,11 +5678,11 @@ static int ipw_best_network(struct ipw_priv *priv,
         * last 3 seconds, do not try and associate again... */
        if (network->last_associate &&
            time_after(network->last_associate + (HZ * 3UL), jiffies)) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                "because of storming (%ums since last "
                                "assoc attempt).\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid),
+                                print_mac(mac, network->bssid),
                                jiffies_to_msecs(jiffies -
                                                 network->last_associate));
                return 0;
@@ -5684,10 +5691,10 @@ static int ipw_best_network(struct ipw_priv *priv,
        /* Now go through and see if the requested network is valid... */
        if (priv->ieee->scan_age != 0 &&
            time_after(jiffies, network->last_scanned + priv->ieee->scan_age)) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                "because of age: %ums.\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid),
+                                print_mac(mac, network->bssid),
                                jiffies_to_msecs(jiffies -
                                                 network->last_scanned));
                return 0;
@@ -5695,10 +5702,10 @@ static int ipw_best_network(struct ipw_priv *priv,
        if ((priv->config & CFG_STATIC_CHANNEL) &&
            (network->channel != priv->channel)) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                "because of channel mismatch: %d != %d.\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid),
+                                print_mac(mac, network->bssid),
                                network->channel, priv->channel);
                return 0;
        }
@@ -5706,10 +5713,10 @@ static int ipw_best_network(struct ipw_priv *priv,
        /* Verify privacy compatability */
        if (((priv->capability & CAP_PRIVACY_ON) ? 1 : 0) !=
            ((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                "because of privacy mismatch: %s != %s.\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid),
+                                print_mac(mac, network->bssid),
                                priv->capability & CAP_PRIVACY_ON ? "on" :
                                "off",
                                network->capability &
@@ -5719,48 +5726,48 @@ static int ipw_best_network(struct ipw_priv *priv,
        if ((priv->config & CFG_STATIC_BSSID) &&
            memcmp(network->bssid, priv->bssid, ETH_ALEN)) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
-                                "because of BSSID mismatch: " MAC_FMT ".\n",
+                                "because of BSSID mismatch: %s.\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid), MAC_ARG(priv->bssid));
+                                print_mac(mac, network->bssid), print_mac(mac, priv->bssid));
                return 0;
        }
        /* Filter out any incompatible freq / mode combinations */
        if (!ieee80211_is_valid_mode(priv->ieee, network->mode)) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                "because of invalid frequency/mode "
                                "combination.\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                return 0;
        }
        /* Filter out invalid channel in current GEO */
        if (!ieee80211_is_valid_channel(priv->ieee, network->channel)) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                "because of invalid channel in current GEO\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                return 0;
        }
        /* Ensure that the rates supported by the driver are compatible with
         * this AP, including verification of basic rates (mandatory) */
        if (!ipw_compatible_rates(priv, network, &rates)) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                "because configured rate mask excludes "
                                "AP mandatory rate.\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                return 0;
        }
        if (rates.num_rates == 0) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                "because of no compatible rates.\n",
                                escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                return 0;
        }
@@ -5772,9 +5779,9 @@ static int ipw_best_network(struct ipw_priv *priv,
        ipw_copy_rates(&match->rates, &rates);
        match->network = network;
-        IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' is a viable match.\n",
+        IPW_DEBUG_ASSOC("Network '%s (%s)' is a viable match.\n",
                        escape_essid(network->ssid, network->ssid_len),
-                        MAC_ARG(network->bssid));
+                        print_mac(mac, network->bssid));
        return 1;
 }
@@ -6016,6 +6023,7 @@ static void ipw_bg_adhoc_check(struct work_struct *work)
 static void ipw_debug_config(struct ipw_priv *priv)
 {
+        DECLARE_MAC_BUF(mac);
        IPW_DEBUG_INFO("Scan completed, no valid APs matched "
                       "[CFG 0x%08X]\n", priv->config);
        if (priv->config & CFG_STATIC_CHANNEL)
@@ -6028,8 +6036,8 @@ static void ipw_debug_config(struct ipw_priv *priv)
        else
                IPW_DEBUG_INFO("ESSID unlocked.\n");
        if (priv->config & CFG_STATIC_BSSID)
-                IPW_DEBUG_INFO("BSSID locked to " MAC_FMT "\n",
+                IPW_DEBUG_INFO("BSSID locked to %s\n",
-                               MAC_ARG(priv->bssid));
+                               print_mac(mac, priv->bssid));
        else
                IPW_DEBUG_INFO("BSSID unlocked.\n");
        if (priv->capability & CAP_PRIVACY_ON)
@@ -7221,6 +7229,7 @@ static int ipw_associate_network(struct ipw_priv *priv,
                                 struct ipw_supported_rates *rates, int roaming)
 {
        int err;
+        DECLARE_MAC_BUF(mac);
        if (priv->config & CFG_FIXED_RATE)
                ipw_set_fixed_rate(priv, network->mode);
@@ -7388,9 +7397,9 @@ static int ipw_associate_network(struct ipw_priv *priv,
                return err;
        }
-        IPW_DEBUG(IPW_DL_STATE, "associating: '%s' " MAC_FMT " \n",
+        IPW_DEBUG(IPW_DL_STATE, "associating: '%s' %s \n",
                  escape_essid(priv->essid, priv->essid_len),
-                  MAC_ARG(priv->bssid));
+                  print_mac(mac, priv->bssid));
        return 0;
 }
@@ -8202,6 +8211,9 @@ static void ipw_rx(struct ipw_priv *priv)
        struct ieee80211_hdr_4addr *header;
        u32 r, w, i;
        u8 network_packet;
+        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mac2);
+        DECLARE_MAC_BUF(mac3);
        r = ipw_read32(priv, IPW_RX_READ_INDEX);
        w = ipw_read32(priv, IPW_RX_WRITE_INDEX);
@@ -8328,14 +8340,17 @@ static void ipw_rx(struct ipw_priv *priv)
                                                                         header)))
                                        {
                                                IPW_DEBUG_DROP("Dropping: "
-                                                               MAC_FMT ", "
+                                                               "%s, "
-                                                               MAC_FMT ", "
+                                                               "%s, "
-                                                               MAC_FMT "\n",
+                                                               "%s\n",
-                                                               MAC_ARG(header->
+                                                               print_mac(mac,
+                                                                         header->
                                                                       addr1),
-                                                               MAC_ARG(header->
+                                                               print_mac(mac2,
+                                                                         header->
                                                                       addr2),
-                                                               MAC_ARG(header->
+                                                               print_mac(mac3,
+                                                                         header->
                                                                       addr3));
                                                break;
                                        }
@@ -8867,6 +8882,7 @@ static int ipw_wx_set_wap(struct net_device *dev,
                          union iwreq_data *wrqu, char *extra)
 {
        struct ipw_priv *priv = ieee80211_priv(dev);
+        DECLARE_MAC_BUF(mac);
        static const unsigned char any[] = {
                0xff, 0xff, 0xff, 0xff, 0xff, 0xff
@@ -8897,8 +8913,8 @@ static int ipw_wx_set_wap(struct net_device *dev,
                return 0;
        }
-        IPW_DEBUG_WX("Setting mandatory BSSID to " MAC_FMT "\n",
+        IPW_DEBUG_WX("Setting mandatory BSSID to %s\n",
-                     MAC_ARG(wrqu->ap_addr.sa_data));
+                     print_mac(mac, wrqu->ap_addr.sa_data));
        memcpy(priv->bssid, wrqu->ap_addr.sa_data, ETH_ALEN);
@@ -8916,6 +8932,8 @@ static int ipw_wx_get_wap(struct net_device *dev,
                          union iwreq_data *wrqu, char *extra)
 {
        struct ipw_priv *priv = ieee80211_priv(dev);
+        DECLARE_MAC_BUF(mac);
        /* If we are associated, trying to associate, or have a statically
         * configured BSSID then return that; otherwise return ANY */
        mutex_lock(&priv->mutex);
@@ -8926,8 +8944,8 @@ static int ipw_wx_get_wap(struct net_device *dev,
        } else
                memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
-        IPW_DEBUG_WX("Getting WAP BSSID: " MAC_FMT "\n",
+        IPW_DEBUG_WX("Getting WAP BSSID: %s\n",
-                     MAC_ARG(wrqu->ap_addr.sa_data));
+                     print_mac(mac, wrqu->ap_addr.sa_data));
        mutex_unlock(&priv->mutex);
        return 0;
 }
@@ -10133,6 +10151,7 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
        u8 id, hdr_len, unicast;
        u16 remaining_bytes;
        int fc;
+        DECLARE_MAC_BUF(mac);
        hdr_len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
        switch (priv->ieee->iw_mode) {
@@ -10143,8 +10162,8 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
                        id = ipw_add_station(priv, hdr->addr1);
                        if (id == IPW_INVALID_STATION) {
                                IPW_WARNING("Attempt to send data to "
-                                            "invalid cell: " MAC_FMT "\n",
+                                            "invalid cell: %s\n",
-                                            MAC_ARG(hdr->addr1));
+                                            print_mac(mac, hdr->addr1));
                                goto drop;
                        }
                }
@@ -10460,13 +10479,15 @@ static int ipw_net_set_mac_address(struct net_device *dev, void *p)
 {
        struct ipw_priv *priv = ieee80211_priv(dev);
        struct sockaddr *addr = p;
+        DECLARE_MAC_BUF(mac);
        if (!is_valid_ether_addr(addr->sa_data))
                return -EADDRNOTAVAIL;
        mutex_lock(&priv->mutex);
        priv->config |= CFG_CUSTOM_MAC;
        memcpy(priv->mac_addr, addr->sa_data, ETH_ALEN);
-        printk(KERN_INFO "%s: Setting MAC to " MAC_FMT "\n",
+        printk(KERN_INFO "%s: Setting MAC to %s\n",
-               priv->net_dev->name, MAC_ARG(priv->mac_addr));
+               priv->net_dev->name, print_mac(mac, priv->mac_addr));
        queue_work(priv->workqueue, &priv->adapter_restart);
        mutex_unlock(&priv->mutex);
        return 0;
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
index a4f4c8798a83..b0d28ae0b324 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
@@ -646,6 +646,7 @@ static struct ieee80211_rate *rs_get_rate(void *priv_rate,
        struct sta_info *sta;
        u16 fc, rate_mask;
        struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
+        DECLARE_MAC_BUF(mac);
        IWL_DEBUG_RATE("enter\n");
@@ -681,8 +682,8 @@ static struct ieee80211_rate *rs_get_rate(void *priv_rate,
                u8 sta_id = iwl_hw_find_station(priv, hdr->addr1);
                if (sta_id == IWL_INVALID_STATION) {
-                        IWL_DEBUG_RATE("LQ: ADD station " MAC_FMT "\n",
+                        IWL_DEBUG_RATE("LQ: ADD station %s\n",
-                                        MAC_ARG(hdr->addr1));
+                                       print_mac(mac, hdr->addr1));
                        sta_id = iwl_add_station(priv,
                                    hdr->addr1, 0, CMD_ASYNC);
                }
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 26f03a0b878d..55f7d89aad8d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -457,13 +457,16 @@ static void iwl3945_rx_reply_rx(struct iwl_priv *priv,
                        }
                case IEEE80211_STYPE_PROBE_REQ:{
+                                DECLARE_MAC_BUF(mac1);
+                                DECLARE_MAC_BUF(mac2);
+                                DECLARE_MAC_BUF(mac3);
                                if (priv->iw_mode == IEEE80211_IF_TYPE_IBSS)
                                        IWL_DEBUG_DROP
-                                            ("Dropping (non network): " MAC_FMT
+                                            ("Dropping (non network): %s"
-                                             ", " MAC_FMT ", " MAC_FMT "\n",
+                                             ", %s, %s\n",
-                                             MAC_ARG(header->addr1),
+                                             print_mac(mac1, header->addr1),
-                                             MAC_ARG(header->addr2),
+                                             print_mac(mac2, header->addr2),
-                                             MAC_ARG(header->addr3));
+                                             print_mac(mac3, header->addr3));
                                return;
                        }
                }
@@ -474,18 +477,22 @@ static void iwl3945_rx_reply_rx(struct iwl_priv *priv,
        case IEEE80211_FTYPE_CTL:
                break;
-        case IEEE80211_FTYPE_DATA:
+        case IEEE80211_FTYPE_DATA: {
+                DECLARE_MAC_BUF(mac1);
+                DECLARE_MAC_BUF(mac2);
+                DECLARE_MAC_BUF(mac3);
                if (unlikely(is_duplicate_packet(priv, header)))
-                        IWL_DEBUG_DROP("Dropping (dup): " MAC_FMT ", "
+                        IWL_DEBUG_DROP("Dropping (dup): %s, %s, %s\n",
-                                       MAC_FMT ", " MAC_FMT "\n",
+                                       print_mac(mac1, header->addr1),
-                                       MAC_ARG(header->addr1),
+                                       print_mac(mac2, header->addr2),
-                                       MAC_ARG(header->addr2),
+                                       print_mac(mac3, header->addr3));
-                                       MAC_ARG(header->addr3));
                else
                        iwl3945_handle_data_packet(priv, 1, rxb, &stats,
                                                   phy_flags);
                break;
        }
+        }
 }
 int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *ptr,
@@ -563,6 +570,7 @@ u8 iwl_hw_find_station(struct iwl_priv *priv, const u8 *addr)
        int i;
        int ret = IWL_INVALID_STATION;
        unsigned long flags;
+        DECLARE_MAC_BUF(mac);
        spin_lock_irqsave(&priv->sta_lock, flags);
        for (i = IWL_STA_ID; i < priv->hw_setting.max_stations; i++)
@@ -573,8 +581,8 @@ u8 iwl_hw_find_station(struct iwl_priv *priv, const u8 *addr)
                        goto out;
                }
-        IWL_DEBUG_INFO("can not find STA " MAC_FMT " (total %d)\n",
+        IWL_DEBUG_INFO("can not find STA %s (total %d)\n",
-                       MAC_ARG(addr), priv->num_stations);
+                       print_mac(mac, addr), priv->num_stations);
 out:
        spin_unlock_irqrestore(&priv->sta_lock, flags);
        return ret;
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
index f3638607d641..7b74481f5282 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
@@ -1737,10 +1737,11 @@ static struct ieee80211_rate *rs_get_rate(void *priv_rate,
        if ((priv->iw_mode == IEEE80211_IF_TYPE_IBSS) && !lq->ibss_sta_added) {
                u8 sta_id = iwl_hw_find_station(priv, hdr->addr1);
+                DECLARE_MAC_BUF(mac);
                if (sta_id == IWL_INVALID_STATION) {
-                        IWL_DEBUG_RATE("LQ: ADD station " MAC_FMT "\n",
+                        IWL_DEBUG_RATE("LQ: ADD station %s\n",
-                                        MAC_ARG(hdr->addr1));
+                                       print_mac(mac, hdr->addr1));
                        sta_id = iwl_add_station(priv,
                                                 hdr->addr1, 0, CMD_ASYNC);
                }
@@ -1811,14 +1812,16 @@ static void rs_rate_init(void *priv_rate, void *priv_sta,
        crl->ibss_sta_added = 0;
        if (priv->iw_mode == IEEE80211_IF_TYPE_AP) {
                u8 sta_id = iwl_hw_find_station(priv, sta->addr);
+                DECLARE_MAC_BUF(mac);
                /* for IBSS the call are from tasklet */
-                IWL_DEBUG_HT("LQ: ADD station " MAC_FMT " \n",
+                IWL_DEBUG_HT("LQ: ADD station %s\n",
-                             MAC_ARG(sta->addr));
+                             print_mac(mac, sta->addr));
                if (sta_id == IWL_INVALID_STATION) {
-                        IWL_DEBUG_RATE("LQ: ADD station " MAC_FMT "\n",
+                        IWL_DEBUG_RATE("LQ: ADD station %s\n",
-                                        MAC_ARG(sta->addr));
+                                       print_mac(mac, sta->addr));
-                                        sta_id = iwl_add_station(priv,
+                        sta_id = iwl_add_station(priv,
                                                 sta->addr, 0, CMD_ASYNC);
                }
                if ((sta_id != IWL_INVALID_STATION)) {
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index ba35b3ac7c7e..e624f2a41e0e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -164,6 +164,7 @@ u8 iwl_hw_find_station(struct iwl_priv *priv, const u8 *addr)
        int start = 0;
        int ret = IWL_INVALID_STATION;
        unsigned long flags;
+        DECLARE_MAC_BUF(mac);
        if ((priv->iw_mode == IEEE80211_IF_TYPE_IBSS) ||
            (priv->iw_mode == IEEE80211_IF_TYPE_AP))
@@ -181,8 +182,8 @@ u8 iwl_hw_find_station(struct iwl_priv *priv, const u8 *addr)
                        goto out;
                }
-        IWL_DEBUG_ASSOC("can not find STA " MAC_FMT " total %d\n",
+        IWL_DEBUG_ASSOC("can not find STA %s total %d\n",
-                        MAC_ARG(addr), priv->num_stations);
+                        print_mac(mac, addr), priv->num_stations);
 out:
        spin_unlock_irqrestore(&priv->sta_lock, flags);
@@ -3909,12 +3910,15 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv,
                case IEEE80211_STYPE_PROBE_REQ:
                        if ((priv->iw_mode == IEEE80211_IF_TYPE_IBSS) &&
                            !iwl_is_associated(priv)) {
+                                DECLARE_MAC_BUF(mac1);
+                                DECLARE_MAC_BUF(mac2);
+                                DECLARE_MAC_BUF(mac3);
                                IWL_DEBUG_DROP("Dropping (non network): "
-                                               MAC_FMT ", " MAC_FMT ", "
+                                               "%s, %s, %s\n",
-                                               MAC_FMT "\n",
+                                               print_mac(mac1, header->addr1),
-                                               MAC_ARG(header->addr1),
+                                               print_mac(mac2, header->addr2),
-                                               MAC_ARG(header->addr2),
+                                               print_mac(mac3, header->addr3));
-                                               MAC_ARG(header->addr3));
                                return;
                        }
                }
@@ -3936,28 +3940,31 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv,
                break;
-        case IEEE80211_FTYPE_DATA:
+        case IEEE80211_FTYPE_DATA: {
+                DECLARE_MAC_BUF(mac1);
+                DECLARE_MAC_BUF(mac2);
+                DECLARE_MAC_BUF(mac3);
                if (priv->iw_mode == IEEE80211_IF_TYPE_AP)
                        iwl4965_update_ps_mode(priv, fc  & IEEE80211_FCTL_PM,
                                                header->addr2);
                if (unlikely(!network_packet))
                        IWL_DEBUG_DROP("Dropping (non network): "
-                                       MAC_FMT ", " MAC_FMT ", "
+                                       "%s, %s, %s\n",
-                                       MAC_FMT "\n",
+                                       print_mac(mac1, header->addr1),
-                                       MAC_ARG(header->addr1),
+                                       print_mac(mac2, header->addr2),
-                                       MAC_ARG(header->addr2),
+                                       print_mac(mac3, header->addr3));
-                                       MAC_ARG(header->addr3));
                else if (unlikely(is_duplicate_packet(priv, header)))
-                        IWL_DEBUG_DROP("Dropping (dup): " MAC_FMT ", "
+                        IWL_DEBUG_DROP("Dropping (dup): %s, %s, %s\n",
-                                       MAC_FMT ", " MAC_FMT "\n",
+                                       print_mac(mac1, header->addr1),
-                                       MAC_ARG(header->addr1),
+                                       print_mac(mac2, header->addr2),
-                                       MAC_ARG(header->addr2),
+                                       print_mac(mac3, header->addr3));
-                                       MAC_ARG(header->addr3));
                else
                        iwl4965_handle_data_packet(priv, 1, include_phy, rxb,
                                                   &stats);
                break;
+        }
        default:
                break;
@@ -4106,10 +4113,12 @@ static void iwl4965_rx_reply_compressed_ba(struct iwl_priv *priv,
        /* TODO: Need to get this copy more sefely - now good for debug */
 /*
-        IWL_DEBUG_TX_REPLY("REPLY_COMPRESSED_BA [%d]Received from " MAC_FMT ",
+        {
-                           sta_id = %d\n",
+        DECLARE_MAC_BUF(mac);
+        IWL_DEBUG_TX_REPLY("REPLY_COMPRESSED_BA [%d]Received from %s, "
+                           "sta_id = %d\n",
                           agg->wait_for_ba,
-                           MAC_ARG((u8*) &ba_resp->sta_addr_lo32),
+                           print_mac(mac, (u8*) &ba_resp->sta_addr_lo32),
                           ba_resp->sta_id);
        IWL_DEBUG_TX_REPLY("TID = %d, SeqCtl = %d, bitmap = 0x%X%X, scd_flow = "
                           "%d, scd_ssn = %d\n",
@@ -4123,6 +4132,7 @@ static void iwl4965_rx_reply_compressed_ba(struct iwl_priv *priv,
                           agg->start_idx,
                           agg->bitmap1,
                           agg->bitmap0);
+        }
 */
        iwl4965_tx_status_reply_compressed_ba(priv, agg, ba_resp);
        /* releases all the TFDs until the SSN */
@@ -4539,14 +4549,15 @@ int iwl_mac_ht_tx_agg_start(struct ieee80211_hw *hw, u8 *da, u16 tid,
        int ssn = -1;
        unsigned long flags;
        struct iwl_tid_data *tid_data;
+        DECLARE_MAC_BUF(mac);
        if (likely(tid < ARRAY_SIZE(default_tid_to_tx_fifo)))
                tx_fifo = default_tid_to_tx_fifo[tid];
        else
                return -EINVAL;
-        IWL_WARNING("iwl-AGG iwl_mac_ht_tx_agg_start on da=" MAC_FMT
+        IWL_WARNING("iwl-AGG iwl_mac_ht_tx_agg_start on da=%s"
-                    " tid=%d\n", MAC_ARG(da), tid);
+                    " tid=%d\n", print_mac(mac, da), tid);
        sta_id = iwl_hw_find_station(priv, da);
        if (sta_id == IWL_INVALID_STATION)
@@ -4577,6 +4588,8 @@ int iwl_mac_ht_tx_agg_stop(struct ieee80211_hw *hw, u8 *da, u16 tid,
        int tx_fifo_id, txq_id, sta_id, ssn = -1;
        struct iwl_tid_data *tid_data;
        int rc;
+        DECLARE_MAC_BUF(mac);
        if (!da) {
                IWL_ERROR("%s: da = NULL\n", __func__);
                return -EINVAL;
@@ -4602,8 +4615,8 @@ int iwl_mac_ht_tx_agg_stop(struct ieee80211_hw *hw, u8 *da, u16 tid,
                return rc;
        iwl4965_ba_status(priv, tid, BA_STATUS_INITIATOR_DELBA);
-        IWL_DEBUG_INFO("iwl_mac_ht_tx_agg_stop on da=" MAC_FMT " tid=%d\n",
+        IWL_DEBUG_INFO("iwl_mac_ht_tx_agg_stop on da=%s tid=%d\n",
-                    MAC_ARG(da), tid);
+                       print_mac(mac, da), tid);
        return 0;
 }
@@ -4613,9 +4626,10 @@ int iwl_mac_ht_rx_agg_start(struct ieee80211_hw *hw, u8 *da,
 {
        struct iwl_priv *priv = hw->priv;
        int sta_id;
+        DECLARE_MAC_BUF(mac);
-        IWL_WARNING("iwl-AGG iwl_mac_ht_rx_agg_start on da=" MAC_FMT
+        IWL_WARNING("iwl-AGG iwl_mac_ht_rx_agg_start on da=%s"
-                    " tid=%d\n", MAC_ARG(da), tid);
+                    " tid=%d\n", print_mac(mac, da), tid);
        sta_id = iwl_hw_find_station(priv, da);
        iwl4965_sta_modify_add_ba_tid(priv, sta_id, tid, start_seq_num);
        return 0;
@@ -4626,9 +4640,10 @@ int iwl_mac_ht_rx_agg_stop(struct ieee80211_hw *hw, u8 *da,
 {
        struct iwl_priv *priv = hw->priv;
        int sta_id;
+        DECLARE_MAC_BUF(mac);
-        IWL_WARNING("iwl-AGG iwl_mac_ht_rx_agg_stop on da=" MAC_FMT " tid=%d\n",
+        IWL_WARNING("iwl-AGG iwl_mac_ht_rx_agg_stop on da=%s tid=%d\n",
-                     MAC_ARG(da), tid);
+                    print_mac(mac, da), tid);
        sta_id = iwl_hw_find_station(priv, da);
        iwl4965_sta_modify_del_ba_tid(priv, sta_id, tid);
        return 0;
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 474b6402040c..cc405f4a8647 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -460,6 +460,7 @@ u8 iwl_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap, u8 flags)
        int index = IWL_INVALID_STATION;
        struct iwl_station_entry *station;
        unsigned long flags_spin;
+        DECLARE_MAC_BUF(mac);
        spin_lock_irqsave(&priv->sta_lock, flags_spin);
        if (is_ap)
@@ -492,7 +493,7 @@ u8 iwl_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap, u8 flags)
                return index;
        }
-        IWL_DEBUG_ASSOC("Add STA ID %d: " MAC_FMT "\n", index, MAC_ARG(addr));
+        IWL_DEBUG_ASSOC("Add STA ID %d: %s\n", index, print_mac(mac, addr));
        station = &priv->stations[index];
        station->used = 1;
        priv->num_stations++;
@@ -1064,6 +1065,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
        /* cast away the const for active_rxon in this function */
        struct iwl_rxon_cmd *active_rxon = (void *)&priv->active_rxon;
        int rc = 0;
+        DECLARE_MAC_BUF(mac);
        if (!iwl_is_alive(priv))
                return -1;
@@ -1134,11 +1136,11 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
        IWL_DEBUG_INFO("Sending RXON\n"
                       "* with%s RXON_FILTER_ASSOC_MSK\n"
                       "* channel = %d\n"
-                       "* bssid = " MAC_FMT "\n",
+                       "* bssid = %s\n",
                       ((priv->staging_rxon.filter_flags &
                         RXON_FILTER_ASSOC_MSK) ? "" : "out"),
                       le16_to_cpu(priv->staging_rxon.channel),
-                       MAC_ARG(priv->staging_rxon.bssid_addr));
+                       print_mac(mac, priv->staging_rxon.bssid_addr));
        /* Apply the new configuration */
        rc = iwl_send_cmd_pdu(priv, REPLY_RXON,
@@ -2693,7 +2695,9 @@ static int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
        /* If this frame is part of a IBSS network, then we use the
         * target specific station id */
-        case IEEE80211_IF_TYPE_IBSS:
+        case IEEE80211_IF_TYPE_IBSS: {
+                DECLARE_MAC_BUF(mac);
                sta_id = iwl_hw_find_station(priv, hdr->addr1);
                if (sta_id != IWL_INVALID_STATION)
                        return sta_id;
@@ -2703,12 +2707,12 @@ static int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
                if (sta_id != IWL_INVALID_STATION)
                        return sta_id;
-                IWL_DEBUG_DROP("Station " MAC_FMT " not in station map. "
+                IWL_DEBUG_DROP("Station %s not in station map. "
                               "Defaulting to broadcast...\n",
-                               MAC_ARG(hdr->addr1));
+                               print_mac(mac, hdr->addr1));
                iwl_print_hex_dump(IWL_DL_DROP, (u8 *) hdr, sizeof(*hdr));
                return priv->hw_setting.bcast_sta_id;
+        }
        default:
                IWL_WARNING("Unkown mode of operation: %d", priv->iw_mode);
                return priv->hw_setting.bcast_sta_id;
@@ -2781,8 +2785,10 @@ static int iwl_tx_skb(struct iwl_priv *priv,
        hdr_len = ieee80211_get_hdrlen(fc);
        sta_id = iwl_get_sta_id(priv, hdr);
        if (sta_id == IWL_INVALID_STATION) {
-                IWL_DEBUG_DROP("Dropping - INVALID STATION: " MAC_FMT "\n",
+                DECLARE_MAC_BUF(mac);
-                               MAC_ARG(hdr->addr1));
+                IWL_DEBUG_DROP("Dropping - INVALID STATION: %s\n",
+                               print_mac(mac, hdr->addr1));
                goto drop;
        }
@@ -4385,6 +4391,8 @@ int iwl_tx_queue_update_write_ptr(struct iwl_priv *priv,
 #ifdef CONFIG_IWLWIFI_DEBUG
 static void iwl_print_rx_config_cmd(struct iwl_rxon_cmd *rxon)
 {
+        DECLARE_MAC_BUF(mac);
        IWL_DEBUG_RADIO("RX CONFIG:\n");
        iwl_print_hex_dump(IWL_DL_RADIO, (u8 *) rxon, sizeof(*rxon));
        IWL_DEBUG_RADIO("u16 channel: 0x%x\n", le16_to_cpu(rxon->channel));
@@ -4395,10 +4403,10 @@ static void iwl_print_rx_config_cmd(struct iwl_rxon_cmd *rxon)
        IWL_DEBUG_RADIO("u8 ofdm_basic_rates: 0x%02x\n",
                        rxon->ofdm_basic_rates);
        IWL_DEBUG_RADIO("u8 cck_basic_rates: 0x%02x\n", rxon->cck_basic_rates);
-        IWL_DEBUG_RADIO("u8[6] node_addr: " MAC_FMT "\n",
+        IWL_DEBUG_RADIO("u8[6] node_addr: %s\n",
-                        MAC_ARG(rxon->node_addr));
+                        print_mac(mac, rxon->node_addr));
-        IWL_DEBUG_RADIO("u8[6] bssid_addr: " MAC_FMT "\n",
+        IWL_DEBUG_RADIO("u8[6] bssid_addr: %s\n",
-                        MAC_ARG(rxon->bssid_addr));
+                        print_mac(mac, rxon->bssid_addr));
        IWL_DEBUG_RADIO("u16 assoc_id: 0x%x\n", le16_to_cpu(rxon->assoc_id));
 }
 #endif
@@ -6322,6 +6330,7 @@ static void iwl_down(struct iwl_priv *priv)
 static int __iwl_up(struct iwl_priv *priv)
 {
+        DECLARE_MAC_BUF(mac);
        int rc, i;
        if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
@@ -6381,8 +6390,8 @@ static int __iwl_up(struct iwl_priv *priv)
                /* MAC Address location in EEPROM same for 3945/4965 */
                get_eeprom_mac(priv, priv->mac_addr);
-                IWL_DEBUG_INFO("MAC address: " MAC_FMT "\n",
+                IWL_DEBUG_INFO("MAC address: %s\n",
-                               MAC_ARG(priv->mac_addr));
+                               print_mac(mac, priv->mac_addr));
                SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);
@@ -6728,6 +6737,7 @@ static void iwl_bg_post_associate(struct work_struct *data)
        int rc = 0;
        struct ieee80211_conf *conf = NULL;
+        DECLARE_MAC_BUF(mac);
        if (priv->iw_mode == IEEE80211_IF_TYPE_AP) {
                IWL_ERROR("%s Should not be called in AP mode\n", __FUNCTION__);
@@ -6735,8 +6745,9 @@ static void iwl_bg_post_associate(struct work_struct *data)
        }
-        IWL_DEBUG_ASSOC("Associated as %d to: " MAC_FMT "\n",
+        IWL_DEBUG_ASSOC("Associated as %d to: %s\n",
-                        priv->assoc_id, MAC_ARG(priv->active_rxon.bssid_addr));
+                        priv->assoc_id,
+                        print_mac(mac, priv->active_rxon.bssid_addr));
        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                return;
@@ -6916,11 +6927,12 @@ static int iwl_mac_add_interface(struct ieee80211_hw *hw,
 {
        struct iwl_priv *priv = hw->priv;
        unsigned long flags;
+        DECLARE_MAC_BUF(mac);
        IWL_DEBUG_MAC80211("enter: id %d, type %d\n", conf->if_id, conf->type);
        if (conf->mac_addr)
-                IWL_DEBUG_MAC80211("enter: MAC " MAC_FMT "\n",
+                IWL_DEBUG_MAC80211("enter: MAC %s\n",
-                                   MAC_ARG(conf->mac_addr));
+                                   print_mac(mac, conf->mac_addr));
        if (priv->interface_id) {
                IWL_DEBUG_MAC80211("leave - interface_id != 0\n");
@@ -7094,6 +7106,7 @@ static int iwl_mac_config_interface(struct ieee80211_hw *hw, int if_id,
                                    struct ieee80211_if_conf *conf)
 {
        struct iwl_priv *priv = hw->priv;
+        DECLARE_MAC_BUF(mac);
        unsigned long flags;
        int rc;
@@ -7111,8 +7124,8 @@ static int iwl_mac_config_interface(struct ieee80211_hw *hw, int if_id,
        IWL_DEBUG_MAC80211("enter: interface id %d\n", if_id);
        if (conf->bssid)
-                IWL_DEBUG_MAC80211("bssid: " MAC_FMT "\n",
+                IWL_DEBUG_MAC80211("bssid: %s\n",
-                                   MAC_ARG(conf->bssid));
+                                   print_mac(mac, conf->bssid));
        if (unlikely(test_bit(STATUS_SCANNING, &priv->status)) &&
            !(priv->hw->flags & IEEE80211_HW_NO_PROBE_FILTERING)) {
@@ -7131,8 +7144,8 @@ static int iwl_mac_config_interface(struct ieee80211_hw *hw, int if_id,
                if (!conf->bssid) {
                        conf->bssid = priv->mac_addr;
                        memcpy(priv->bssid, priv->mac_addr, ETH_ALEN);
-                        IWL_DEBUG_MAC80211("bssid was set to: " MAC_FMT "\n",
+                        IWL_DEBUG_MAC80211("bssid was set to: %s\n",
-                                           MAC_ARG(conf->bssid));
+                                           print_mac(mac, conf->bssid));
                }
                if (priv->ibss_beacon)
                        dev_kfree_skb(priv->ibss_beacon);
@@ -7282,8 +7295,10 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, set_key_cmd cmd,
        sta_id = iwl_hw_find_station(priv, addr);
        if (sta_id == IWL_INVALID_STATION) {
-                IWL_DEBUG_MAC80211("leave - " MAC_FMT " not in station map.\n",
+                DECLARE_MAC_BUF(mac);
-                                   MAC_ARG(addr));
+                IWL_DEBUG_MAC80211("leave - %s not in station map.\n",
+                                   print_mac(mac, addr));
                return -EINVAL;
        }
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index b79dabc8c01c..6cea3118b7c1 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -459,6 +459,7 @@ u8 iwl_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap, u8 flags)
        int index = IWL_INVALID_STATION;
        struct iwl_station_entry *station;
        unsigned long flags_spin;
+        DECLARE_MAC_BUF(mac);
        spin_lock_irqsave(&priv->sta_lock, flags_spin);
        if (is_ap)
@@ -493,7 +494,7 @@ u8 iwl_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap, u8 flags)
        }
-        IWL_DEBUG_ASSOC("Add STA ID %d: " MAC_FMT "\n", index, MAC_ARG(addr));
+        IWL_DEBUG_ASSOC("Add STA ID %d: %s\n", index, print_mac(mac, addr));
        station = &priv->stations[index];
        station->used = 1;
        priv->num_stations++;
@@ -1083,6 +1084,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
 {
        /* cast away the const for active_rxon in this function */
        struct iwl_rxon_cmd *active_rxon = (void *)&priv->active_rxon;
+        DECLARE_MAC_BUF(mac);
        int rc = 0;
        if (!iwl_is_alive(priv))
@@ -1160,11 +1162,11 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
        IWL_DEBUG_INFO("Sending RXON\n"
                       "* with%s RXON_FILTER_ASSOC_MSK\n"
                       "* channel = %d\n"
-                       "* bssid = " MAC_FMT "\n",
+                       "* bssid = %s\n",
                       ((priv->staging_rxon.filter_flags &
                         RXON_FILTER_ASSOC_MSK) ? "" : "out"),
                       le16_to_cpu(priv->staging_rxon.channel),
-                       MAC_ARG(priv->staging_rxon.bssid_addr));
+                       print_mac(mac, priv->staging_rxon.bssid_addr));
        /* Apply the new configuration */
        rc = iwl_send_cmd_pdu(priv, REPLY_RXON,
@@ -2748,6 +2750,7 @@ static int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
 {
        int sta_id;
        u16 fc = le16_to_cpu(hdr->frame_control);
+        DECLARE_MAC_BUF(mac);
        /* If this frame is broadcast or not data then use the broadcast
         * station id */
@@ -2781,9 +2784,9 @@ static int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
                if (sta_id != IWL_INVALID_STATION)
                        return sta_id;
-                IWL_DEBUG_DROP("Station " MAC_FMT " not in station map. "
+                IWL_DEBUG_DROP("Station %s not in station map. "
                               "Defaulting to broadcast...\n",
-                               MAC_ARG(hdr->addr1));
+                               print_mac(mac, hdr->addr1));
                iwl_print_hex_dump(IWL_DL_DROP, (u8 *) hdr, sizeof(*hdr));
                return priv->hw_setting.bcast_sta_id;
@@ -2859,8 +2862,10 @@ static int iwl_tx_skb(struct iwl_priv *priv,
        hdr_len = ieee80211_get_hdrlen(fc);
        sta_id = iwl_get_sta_id(priv, hdr);
        if (sta_id == IWL_INVALID_STATION) {
-                IWL_DEBUG_DROP("Dropping - INVALID STATION: " MAC_FMT "\n",
+                DECLARE_MAC_BUF(mac);
-                               MAC_ARG(hdr->addr1));
+                IWL_DEBUG_DROP("Dropping - INVALID STATION: %s\n",
+                               print_mac(mac, hdr->addr1));
                goto drop;
        }
@@ -4703,6 +4708,8 @@ int iwl_tx_queue_update_write_ptr(struct iwl_priv *priv,
 #ifdef CONFIG_IWLWIFI_DEBUG
 static void iwl_print_rx_config_cmd(struct iwl_rxon_cmd *rxon)
 {
+        DECLARE_MAC_BUF(mac);
        IWL_DEBUG_RADIO("RX CONFIG:\n");
        iwl_print_hex_dump(IWL_DL_RADIO, (u8 *) rxon, sizeof(*rxon));
        IWL_DEBUG_RADIO("u16 channel: 0x%x\n", le16_to_cpu(rxon->channel));
@@ -4713,10 +4720,10 @@ static void iwl_print_rx_config_cmd(struct iwl_rxon_cmd *rxon)
        IWL_DEBUG_RADIO("u8 ofdm_basic_rates: 0x%02x\n",
                        rxon->ofdm_basic_rates);
        IWL_DEBUG_RADIO("u8 cck_basic_rates: 0x%02x\n", rxon->cck_basic_rates);
-        IWL_DEBUG_RADIO("u8[6] node_addr: " MAC_FMT "\n",
+        IWL_DEBUG_RADIO("u8[6] node_addr: %s\n",
-                        MAC_ARG(rxon->node_addr));
+                        print_mac(mac, rxon->node_addr));
-        IWL_DEBUG_RADIO("u8[6] bssid_addr: " MAC_FMT "\n",
+        IWL_DEBUG_RADIO("u8[6] bssid_addr: %s\n",
-                        MAC_ARG(rxon->bssid_addr));
+                        print_mac(mac, rxon->bssid_addr));
        IWL_DEBUG_RADIO("u16 assoc_id: 0x%x\n", le16_to_cpu(rxon->assoc_id));
 }
 #endif
@@ -6670,6 +6677,7 @@ static void iwl_down(struct iwl_priv *priv)
 static int __iwl_up(struct iwl_priv *priv)
 {
+        DECLARE_MAC_BUF(mac);
        int rc, i;
        u32 hw_rf_kill = 0;
@@ -6742,8 +6750,8 @@ static int __iwl_up(struct iwl_priv *priv)
                /* MAC Address location in EEPROM same for 3945/4965 */
                get_eeprom_mac(priv, priv->mac_addr);
-                IWL_DEBUG_INFO("MAC address: " MAC_FMT "\n",
+                IWL_DEBUG_INFO("MAC address: %s\n",
-                               MAC_ARG(priv->mac_addr));
+                               print_mac(mac, priv->mac_addr));
                SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);
@@ -7096,14 +7104,16 @@ static void iwl_bg_post_associate(struct work_struct *data)
        int rc = 0;
        struct ieee80211_conf *conf = NULL;
+        DECLARE_MAC_BUF(mac);
        if (priv->iw_mode == IEEE80211_IF_TYPE_AP) {
                IWL_ERROR("%s Should not be called in AP mode\n", __FUNCTION__);
                return;
        }
-        IWL_DEBUG_ASSOC("Associated as %d to: " MAC_FMT "\n",
+        IWL_DEBUG_ASSOC("Associated as %d to: %s\n",
-                        priv->assoc_id, MAC_ARG(priv->active_rxon.bssid_addr));
+                        priv->assoc_id,
+                        print_mac(mac, priv->active_rxon.bssid_addr));
        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
@@ -7299,11 +7309,12 @@ static int iwl_mac_add_interface(struct ieee80211_hw *hw,
 {
        struct iwl_priv *priv = hw->priv;
        unsigned long flags;
+        DECLARE_MAC_BUF(mac);
        IWL_DEBUG_MAC80211("enter: id %d, type %d\n", conf->if_id, conf->type);
        if (conf->mac_addr)
-                IWL_DEBUG_MAC80211("enter: MAC " MAC_FMT "\n",
+                IWL_DEBUG_MAC80211("enter: MAC %s\n",
-                                   MAC_ARG(conf->mac_addr));
+                                   print_mac(mac, conf->mac_addr));
        if (priv->interface_id) {
                IWL_DEBUG_MAC80211("leave - interface_id != 0\n");
@@ -7494,6 +7505,7 @@ static int iwl_mac_config_interface(struct ieee80211_hw *hw, int if_id,
                                    struct ieee80211_if_conf *conf)
 {
        struct iwl_priv *priv = hw->priv;
+        DECLARE_MAC_BUF(mac);
        unsigned long flags;
        int rc;
@@ -7511,8 +7523,8 @@ static int iwl_mac_config_interface(struct ieee80211_hw *hw, int if_id,
        IWL_DEBUG_MAC80211("enter: interface id %d\n", if_id);
        if (conf->bssid)
-                IWL_DEBUG_MAC80211("bssid: " MAC_FMT "\n",
+                IWL_DEBUG_MAC80211("bssid: %s\n",
-                                   MAC_ARG(conf->bssid));
+                                   print_mac(mac, conf->bssid));
        if (unlikely(test_bit(STATUS_SCANNING, &priv->status)) &&
            !(priv->hw->flags & IEEE80211_HW_NO_PROBE_FILTERING)) {
@@ -7531,8 +7543,8 @@ static int iwl_mac_config_interface(struct ieee80211_hw *hw, int if_id,
                if (!conf->bssid) {
                        conf->bssid = priv->mac_addr;
                        memcpy(priv->bssid, priv->mac_addr, ETH_ALEN);
-                        IWL_DEBUG_MAC80211("bssid was set to: " MAC_FMT "\n",
+                        IWL_DEBUG_MAC80211("bssid was set to: %s\n",
-                                           MAC_ARG(conf->bssid));
+                                           print_mac(mac, conf->bssid));
                }
                if (priv->ibss_beacon)
                        dev_kfree_skb(priv->ibss_beacon);
@@ -7666,6 +7678,7 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, set_key_cmd cmd,
                           struct ieee80211_key_conf *key)
 {
        struct iwl_priv *priv = hw->priv;
+        DECLARE_MAC_BUF(mac);
        int rc = 0;
        u8 sta_id;
@@ -7682,8 +7695,8 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, set_key_cmd cmd,
        sta_id = iwl_hw_find_station(priv, addr);
        if (sta_id == IWL_INVALID_STATION) {
-                IWL_DEBUG_MAC80211("leave - " MAC_FMT " not in station map.\n",
+                IWL_DEBUG_MAC80211("leave - %s not in station map.\n",
-                                   MAC_ARG(addr));
+                                   print_mac(mac, addr));
                return -EINVAL;
        }
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index 3131afcf4590..2c6ddb1f0072 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -16,6 +16,7 @@ static const u8 bssid_off[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 static void print_assoc_req(const char * extra, struct assoc_request * assoc_req)
 {
+        DECLARE_MAC_BUF(mac);
        lbs_deb_assoc(
               "#### Association Request: %s\n"
               "       flags:      0x%08lX\n"
@@ -23,13 +24,13 @@ static void print_assoc_req(const char * extra, struct assoc_request * assoc_req
               "       channel:    %d\n"
               "       band:       %d\n"
               "       mode:       %d\n"
-               "       BSSID:      " MAC_FMT "\n"
+               "       BSSID:      %s\n"
               "       Encryption:%s%s%s\n"
               "       auth:       %d\n",
               extra, assoc_req->flags,
               escape_essid(assoc_req->ssid, assoc_req->ssid_len),
               assoc_req->channel, assoc_req->band, assoc_req->mode,
-               MAC_ARG(assoc_req->bssid),
+               print_mac(mac, assoc_req->bssid),
               assoc_req->secinfo.WPAenabled ? " WPA" : "",
               assoc_req->secinfo.WPA2enabled ? " WPA2" : "",
               assoc_req->secinfo.wep_enabled ? " WEP" : "",
@@ -104,16 +105,17 @@ static int assoc_helper_bssid(wlan_private *priv,
        wlan_adapter *adapter = priv->adapter;
        int ret = 0;
        struct bss_descriptor * bss;
+        DECLARE_MAC_BUF(mac);
-        lbs_deb_enter_args(LBS_DEB_ASSOC, "BSSID " MAC_FMT,
+        lbs_deb_enter_args(LBS_DEB_ASSOC, "BSSID %s",
-                MAC_ARG(assoc_req->bssid));
+                print_mac(mac, assoc_req->bssid));
        /* Search for index position in list for requested MAC */
        bss = libertas_find_bssid_in_list(adapter, assoc_req->bssid,
                            assoc_req->mode);
        if (bss == NULL) {
-                lbs_deb_assoc("ASSOC: WAP: BSSID " MAC_FMT " not found, "
+                lbs_deb_assoc("ASSOC: WAP: BSSID %s not found, "
-                        "cannot associate.\n", MAC_ARG(assoc_req->bssid));
+                        "cannot associate.\n", print_mac(mac, assoc_req->bssid));
                goto out;
        }
@@ -481,6 +483,7 @@ void libertas_association_worker(struct work_struct *work)
        struct assoc_request * assoc_req = NULL;
        int ret = 0;
        int find_any_ssid = 0;
+        DECLARE_MAC_BUF(mac);
        lbs_deb_enter(LBS_DEB_ASSOC);
@@ -629,10 +632,10 @@ void libertas_association_worker(struct work_struct *work)
                if (success) {
                        lbs_deb_assoc("ASSOC: association attempt successful. "
-                                "Associated to '%s' (" MAC_FMT ")\n",
+                                "Associated to '%s' (%s)\n",
                                escape_essid(adapter->curbssparams.ssid,
                                             adapter->curbssparams.ssid_len),
-                                MAC_ARG(adapter->curbssparams.bssid));
+                                print_mac(mac, adapter->curbssparams.bssid));
                        libertas_prepare_and_send_command(priv,
                                CMD_802_11_RSSI,
                                0, CMD_OPTION_WAITFORRSP, 0, NULL);
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index d64ad87db459..fe70e30b1f3c 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -159,6 +159,7 @@ static int wlan_ret_get_hw_spec(wlan_private * priv,
        struct cmd_ds_get_hw_spec *hwspec = &resp->params.hwspec;
        wlan_adapter *adapter = priv->adapter;
        int ret = 0;
+        DECLARE_MAC_BUF(mac);
        lbs_deb_enter(LBS_DEB_CMD);
@@ -169,8 +170,8 @@ static int wlan_ret_get_hw_spec(wlan_private * priv,
        lbs_deb_cmd("GET_HW_SPEC: firmware release %u.%u.%up%u\n",
                    adapter->fwreleasenumber[2], adapter->fwreleasenumber[1],
                    adapter->fwreleasenumber[0], adapter->fwreleasenumber[3]);
-        lbs_deb_cmd("GET_HW_SPEC: MAC addr " MAC_FMT "\n",
+        lbs_deb_cmd("GET_HW_SPEC: MAC addr %s\n",
-               MAC_ARG(hwspec->permanentaddr));
+                    print_mac(mac, hwspec->permanentaddr));
        lbs_deb_cmd("GET_HW_SPEC: hardware interface 0x%x, hardware spec 0x%04x\n",
               hwspec->hwifversion, hwspec->version);
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index 816f42e4f5b4..cb00b080409e 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -63,6 +63,7 @@ static ssize_t libertas_getscantable(struct file *file, char __user *userbuf,
        int numscansdone = 0, res;
        unsigned long addr = get_zeroed_page(GFP_KERNEL);
        char *buf = (char *)addr;
+        DECLARE_MAC_BUF(mac);
        struct bss_descriptor * iter_bss;
        pos += snprintf(buf+pos, len-pos,
@@ -75,9 +76,9 @@ static ssize_t libertas_getscantable(struct file *file, char __user *userbuf,
                u16 spectrum_mgmt = (iter_bss->capability & WLAN_CAPABILITY_SPECTRUM_MGMT);
                pos += snprintf(buf+pos, len-pos,
-                        "%02u| %03d | %04ld | " MAC_FMT " |",
+                        "%02u| %03d | %04ld | %s |",
                        numscansdone, iter_bss->channel, iter_bss->rssi,
-                        MAC_ARG(iter_bss->bssid));
+                        print_mac(mac, iter_bss->bssid));
                pos += snprintf(buf+pos, len-pos, " %04x-", iter_bss->capability);
                pos += snprintf(buf+pos, len-pos, "%c%c%c |",
                                ibss ? 'A' : 'I', privacy ? 'P' : ' ',
diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
index 0ad1362b14e2..8dcff00574f3 100644
--- a/drivers/net/wireless/libertas/join.c
+++ b/drivers/net/wireless/libertas/join.c
@@ -293,6 +293,7 @@ int libertas_cmd_80211_authenticate(wlan_private * priv,
        struct cmd_ds_802_11_authenticate *pauthenticate = &cmd->params.auth;
        int ret = -1;
        u8 *bssid = pdata_buf;
+        DECLARE_MAC_BUF(mac);
        lbs_deb_enter(LBS_DEB_JOIN);
@@ -319,8 +320,8 @@ int libertas_cmd_80211_authenticate(wlan_private * priv,
        memcpy(pauthenticate->macaddr, bssid, ETH_ALEN);
-        lbs_deb_join("AUTH_CMD: BSSID is : " MAC_FMT " auth=0x%X\n",
+        lbs_deb_join("AUTH_CMD: BSSID is : %s auth=0x%X\n",
-                     MAC_ARG(bssid), pauthenticate->authtype);
+                     print_mac(mac, bssid), pauthenticate->authtype);
        ret = 0;
 out:
@@ -598,6 +599,7 @@ int libertas_cmd_80211_ad_hoc_join(wlan_private * priv,
        int cmdappendsize = 0;
        int ret = 0;
        u16 ratesize = 0;
+        DECLARE_MAC_BUF(mac);
        lbs_deb_enter(LBS_DEB_JOIN);
@@ -621,8 +623,9 @@ int libertas_cmd_80211_ad_hoc_join(wlan_private * priv,
        /* information on BSSID descriptor passed to FW */
        lbs_deb_join(
-               "ADHOC_J_CMD: BSSID = " MAC_FMT ", SSID = '%s'\n",
+               "ADHOC_J_CMD: BSSID = %s, SSID = '%s'\n",
-               MAC_ARG(join_cmd->bss.bssid), join_cmd->bss.ssid);
+               print_mac(mac, join_cmd->bss.bssid),
+               join_cmd->bss.ssid);
        /* failtimeout */
        join_cmd->failtimeout = cpu_to_le16(MRVDRV_ASSOCIATION_TIME_OUT);
@@ -829,6 +832,7 @@ int libertas_ret_80211_ad_hoc_start(wlan_private * priv,
        struct cmd_ds_802_11_ad_hoc_result *padhocresult;
        union iwreq_data wrqu;
        struct bss_descriptor *bss;
+        DECLARE_MAC_BUF(mac);
        lbs_deb_enter(LBS_DEB_JOIN);
@@ -894,8 +898,8 @@ int libertas_ret_80211_ad_hoc_start(wlan_private * priv,
        lbs_deb_join("ADHOC_RESP: - Joined/Started Ad Hoc\n");
        lbs_deb_join("ADHOC_RESP: channel = %d\n", adapter->curbssparams.channel);
-        lbs_deb_join("ADHOC_RESP: BSSID = " MAC_FMT "\n",
+        lbs_deb_join("ADHOC_RESP: BSSID = %s\n",
-               MAC_ARG(padhocresult->bssid));
+                     print_mac(mac, padhocresult->bssid));
 done:
        lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index a54171af7b97..5ead08312e1e 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -677,6 +677,7 @@ static void libertas_set_multicast_list(struct net_device *dev)
        wlan_private *priv = dev->priv;
        wlan_adapter *adapter = priv->adapter;
        int oldpacketfilter;
+        DECLARE_MAC_BUF(mac);
        lbs_deb_enter(LBS_DEB_NET);
@@ -723,14 +724,9 @@ static void libertas_set_multicast_list(struct net_device *dev)
                                       dev->mc_count);
                                for (i = 0; i < dev->mc_count; i++) {
-                                        lbs_deb_net("Multicast address %d:"
+                                        lbs_deb_net("Multicast address %d:%s\n",
-                                               MAC_FMT "\n", i,
+                                               i, print_mac(mac,
-                                               adapter->multicastlist[i][0],
+                                               adapter->multicastlist[i]));
-                                               adapter->multicastlist[i][1],
-                                               adapter->multicastlist[i][2],
-                                               adapter->multicastlist[i][3],
-                                               adapter->multicastlist[i][4],
-                                               adapter->multicastlist[i][5]);
                                }
                                /* send multicast addresses to firmware */
                                libertas_prepare_and_send_command(priv,
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index e2e9ebcd8340..8f073ad1957f 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -777,6 +777,7 @@ int wlan_scan_networks(wlan_private * priv,
 #ifdef CONFIG_LIBERTAS_DEBUG
        struct bss_descriptor * iter_bss;
        int i = 0;
+        DECLARE_MAC_BUF(mac);
 #endif
        lbs_deb_enter(LBS_DEB_SCAN);
@@ -831,8 +832,8 @@ int wlan_scan_networks(wlan_private * priv,
        /* Dump the scan table */
        mutex_lock(&adapter->lock);
        list_for_each_entry (iter_bss, &adapter->network_list, list) {
-                lbs_deb_scan("Scan:(%02d) " MAC_FMT ", RSSI[%03d], SSID[%s]\n",
+                lbs_deb_scan("Scan:(%02d) %s, RSSI[%03d], SSID[%s]\n",
-                       i++, MAC_ARG(iter_bss->bssid), (s32) iter_bss->rssi,
+                       i++, print_mac(mac, iter_bss->bssid), (s32) iter_bss->rssi,
                       escape_essid(iter_bss->ssid, iter_bss->ssid_len));
        }
        mutex_unlock(&adapter->lock);
@@ -876,6 +877,7 @@ static int libertas_process_bss(struct bss_descriptor * bss,
        struct ieeetypes_dsparamset *pDS;
        struct ieeetypes_cfparamset *pCF;
        struct ieeetypes_ibssparamset *pibss;
+        DECLARE_MAC_BUF(mac);
        struct ieeetypes_countryinfoset *pcountryinfo;
        u8 *pos, *end, *p;
        u8 n_ex_rates = 0, got_basic_rates = 0, n_basic_rates = 0;
@@ -906,7 +908,7 @@ static int libertas_process_bss(struct bss_descriptor * bss,
        *bytesleft -= beaconsize;
        memcpy(bss->bssid, pos, ETH_ALEN);
-        lbs_deb_scan("process_bss: AP BSSID " MAC_FMT "\n", MAC_ARG(bss->bssid));
+        lbs_deb_scan("process_bss: AP BSSID %s\n", print_mac(mac, bss->bssid));
        pos += ETH_ALEN;
        if ((end - pos) < 12) {
@@ -1724,6 +1726,7 @@ int libertas_ret_80211_scan(wlan_private * priv, struct cmd_ds_command *resp)
                struct bss_descriptor new;
                struct bss_descriptor * found = NULL;
                struct bss_descriptor * oldest = NULL;
+                DECLARE_MAC_BUF(mac);
                /* Process the data fields and IEs returned for this BSS */
                memset(&new, 0, sizeof (struct bss_descriptor));
@@ -1762,9 +1765,8 @@ int libertas_ret_80211_scan(wlan_private * priv, struct cmd_ds_command *resp)
                        continue;
                }
-                lbs_deb_scan("SCAN_RESP: BSSID = " MAC_FMT "\n",
+                lbs_deb_scan("SCAN_RESP: BSSID = %s\n",
-                       new.bssid[0], new.bssid[1], new.bssid[2],
+                             print_mac(mac, new.bssid));
-                       new.bssid[3], new.bssid[4], new.bssid[5]);
                /* Copy the locally created newbssentry to the scan table */
                memcpy(found, &new, offsetof(struct bss_descriptor, list));
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index f8036efd7294..0b2103e0af57 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -1160,7 +1160,7 @@ static int wlan_get_encode(struct net_device *dev,
        dwrq->flags |= IW_ENCODE_NOKEY;
-        lbs_deb_wext("key: " MAC_FMT ", keylen %d\n",
+        lbs_deb_wext("key: %02x:%02x:%02x:%02x:%02x:%02x, keylen %d\n",
               extra[0], extra[1], extra[2],
               extra[3], extra[4], extra[5], dwrq->length);
@@ -1980,13 +1980,14 @@ static int wlan_set_wap(struct net_device *dev, struct iw_request_info *info,
        wlan_adapter *adapter = priv->adapter;
        struct assoc_request * assoc_req;
        int ret = 0;
+        DECLARE_MAC_BUF(mac);
        lbs_deb_enter(LBS_DEB_WEXT);
        if (awrq->sa_family != ARPHRD_ETHER)
                return -EINVAL;
-        lbs_deb_wext("ASSOC: WAP: sa_data " MAC_FMT "\n", MAC_ARG(awrq->sa_data));
+        lbs_deb_wext("ASSOC: WAP: sa_data %s\n", print_mac(mac, awrq->sa_data));
        mutex_lock(&adapter->lock);
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index d8a59afa7178..c2d71afd57e5 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -737,6 +737,7 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) {
    win_req_t req;
    memreq_t mem;
    u_char __iomem *ramBase = NULL;
+    DECLARE_MAC_BUF(mac);
    DEBUG(0, "netwave_pcmcia_config(0x%p)\n", link);
@@ -805,12 +806,13 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) {
    for (i = 0; i < 6; i++) 
        dev->dev_addr[i] = readb(ramBase + NETWAVE_EREG_PA + i);
-    printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx id "
+    printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx"
-           "%c%c, hw_addr ", dev->name, dev->base_addr, dev->irq,
+           "id %c%c, hw_addr %s\n",
-           (u_long) ramBase, (int) readb(ramBase+NETWAVE_EREG_NI),
+           dev->name, dev->base_addr, dev->irq,
-           (int) readb(ramBase+NETWAVE_EREG_NI+1));
+           (u_long) ramBase,
-    for (i = 0; i < 6; i++)
+           (int) readb(ramBase+NETWAVE_EREG_NI),
-        printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : "\n"));
+           (int) readb(ramBase+NETWAVE_EREG_NI+1),
+           print_mac(mac, dev->dev_addr));
    /* get revision words */
    printk(KERN_DEBUG "Netwave_reset: revision %04x %04x\n", 
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index 062286dc8e15..ca6c2da7bc5d 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -2232,6 +2232,7 @@ static int orinoco_init(struct net_device *dev)
        struct hermes_idstring nickbuf;
        u16 reclen;
        int len;
+        DECLARE_MAC_BUF(mac);
        /* No need to lock, the hw_unavailable flag is already set in
         * alloc_orinocodev() */
@@ -2274,10 +2275,8 @@ static int orinoco_init(struct net_device *dev)
                goto out;
        }
-        printk(KERN_DEBUG "%s: MAC address %02X:%02X:%02X:%02X:%02X:%02X\n",
+        printk(KERN_DEBUG "%s: MAC address %s\n",
-               dev->name, dev->dev_addr[0], dev->dev_addr[1],
+               dev->name, print_mac(mac, dev->dev_addr));
-               dev->dev_addr[2], dev->dev_addr[3], dev->dev_addr[4],
-               dev->dev_addr[5]);
        /* Get the station name */
        err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CNFOWNNAME,
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 77ea13bf0c02..6d80ca421cf0 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -2029,12 +2029,12 @@ static void
 format_event(islpci_private *priv, char *dest, const char *str,
             const struct obj_mlme *mlme, u16 *length, int error)
 {
-        const u8 *a = mlme->address;
+        DECLARE_MAC_BUF(mac);
        int n = snprintf(dest, IW_CUSTOM_MAX,
-                         "%s %s %2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X %s (%2.2X)",
+                         "%s %s %s %s (%2.2X)",
                         str,
                         ((priv->iw_mode == IW_MODE_MASTER) ? "from" : "to"),
-                         a[0], a[1], a[2], a[3], a[4], a[5],
+                         print_mac(mac, mlme->address),
                         (error ? (mlme->code ? " : REJECTED " : " : ACCEPTED ")
                          : ""), mlme->code);
        BUG_ON(n > IW_CUSTOM_MAX);
@@ -2105,15 +2105,13 @@ struct ieee80211_beacon_phdr {
 #define WLAN_EID_GENERIC 0xdd
 static u8 wpa_oid[4] = { 0x00, 0x50, 0xf2, 1 };
-#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
-#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
 static void
 prism54_wpa_bss_ie_add(islpci_private *priv, u8 *bssid,
                       u8 *wpa_ie, size_t wpa_ie_len)
 {
        struct list_head *ptr;
        struct islpci_bss_wpa_ie *bss = NULL;
+        DECLARE_MAC_BUF(mac);
        if (wpa_ie_len > MAX_WPA_IE_LEN)
                wpa_ie_len = MAX_WPA_IE_LEN;
@@ -2154,8 +2152,8 @@ prism54_wpa_bss_ie_add(islpci_private *priv, u8 *bssid,
                bss->wpa_ie_len = wpa_ie_len;
                bss->last_update = jiffies;
        } else {
-                printk(KERN_DEBUG "Failed to add BSS WPA entry for " MACSTR
+                printk(KERN_DEBUG "Failed to add BSS WPA entry for "
-                       "\n", MAC2STR(bssid));
+                       "%s\n", print_mac(mac, bssid));
        }
        /* expire old entries from WPA list */
@@ -2221,6 +2219,7 @@ prism54_process_bss_data(islpci_private *priv, u32 oid, u8 *addr,
 {
        struct ieee80211_beacon_phdr *hdr;
        u8 *pos, *end;
+        DECLARE_MAC_BUF(mac);
        if (!priv->wpa)
                return;
@@ -2231,7 +2230,7 @@ prism54_process_bss_data(islpci_private *priv, u32 oid, u8 *addr,
        while (pos < end) {
                if (pos + 2 + pos[1] > end) {
                        printk(KERN_DEBUG "Parsing Beacon/ProbeResp failed "
-                               "for " MACSTR "\n", MAC2STR(addr));
+                               "for %s\n", print_mac(mac, addr));
                        return;
                }
                if (pos[0] == WLAN_EID_GENERIC && pos[1] >= 4 &&
@@ -2270,6 +2269,7 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid,
        size_t len = 0; /* u16, better? */
        u8 *payload = NULL, *pos = NULL;
        int ret;
+        DECLARE_MAC_BUF(mac);
        /* I think all trapable objects are listed here.
         * Some oids have a EX version. The difference is that they are emitted
@@ -2358,14 +2358,8 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid,
                        break;
                memcpy(&confirm->address, mlmeex->address, ETH_ALEN);
-                printk(KERN_DEBUG "Authenticate from: address:\t%02x:%02x:%02x:%02x:%02x:%02x\n",
+                printk(KERN_DEBUG "Authenticate from: address:\t%s\n",
-                                mlmeex->address[0],
+                       print_mac(mac, mlmeex->address));
-                                mlmeex->address[1],
-                                mlmeex->address[2],
-                                mlmeex->address[3],
-                                mlmeex->address[4],
-                                mlmeex->address[5]
-                                );
                confirm->id = -1; /* or mlmeex->id ? */
                confirm->state = 0; /* not used */
                confirm->code = 0;
@@ -2410,15 +2404,8 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid,
                wpa_ie_len = prism54_wpa_bss_ie_get(priv, mlmeex->address, wpa_ie);
                if (!wpa_ie_len) {
-                        printk(KERN_DEBUG "No WPA IE found from "
+                        printk(KERN_DEBUG "No WPA IE found from address:\t%s\n",
-                                        "address:\t%02x:%02x:%02x:%02x:%02x:%02x\n",
+                               print_mac(mac, mlmeex->address));
-                                mlmeex->address[0],
-                                mlmeex->address[1],
-                                mlmeex->address[2],
-                                mlmeex->address[3],
-                                mlmeex->address[4],
-                                mlmeex->address[5]
-                                );
                        kfree(confirm);
                        break;
                }
@@ -2454,15 +2441,8 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid,
                wpa_ie_len = prism54_wpa_bss_ie_get(priv, mlmeex->address, wpa_ie);
                if (!wpa_ie_len) {
-                        printk(KERN_DEBUG "No WPA IE found from "
+                        printk(KERN_DEBUG "No WPA IE found from address:\t%s\n",
-                                        "address:\t%02x:%02x:%02x:%02x:%02x:%02x\n",
+                               print_mac(mac, mlmeex->address));
-                                mlmeex->address[0],
-                                mlmeex->address[1],
-                                mlmeex->address[2],
-                                mlmeex->address[3],
-                                mlmeex->address[4],
-                                mlmeex->address[5]
-                                );
                        kfree(confirm);
                        break;
                }
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 429bca8d0b5f..f87fe10059ae 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -412,6 +412,7 @@ static int ray_config(struct pcmcia_device *link)
    memreq_t mem;
    struct net_device *dev = (struct net_device *)link->priv;
    ray_dev_t *local = netdev_priv(dev);
+    DECLARE_MAC_BUF(mac);
    DEBUG(1, "ray_config(0x%p)\n", link);
@@ -482,10 +483,8 @@ static int ray_config(struct pcmcia_device *link)
    strcpy(local->node.dev_name, dev->name);
    link->dev_node = &local->node;
-    printk(KERN_INFO "%s: RayLink, irq %d, hw_addr ",
+    printk(KERN_INFO "%s: RayLink, irq %d, hw_addr %s\n",
-       dev->name, dev->irq);
+       dev->name, dev->irq, print_mac(mac, dev->dev_addr));
-    for (i = 0; i < 6; i++)
-    printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : "\n"));
    return 0;
@@ -2610,6 +2609,7 @@ static int ray_cs_proc_read(char *buf, char **start, off_t offset, int len)
    UCHAR *p;
    struct freq_hop_element *pfh;
    UCHAR c[33];
+    DECLARE_MAC_BUF(mac);
    link = this_device;
    if (!link)
@@ -2639,9 +2639,8 @@ static int ray_cs_proc_read(char *buf, char **start, off_t offset, int len)
                   nettype[local->sparm.b5.a_network_type], c);
    p = local->bss_id;
-    len += sprintf(buf + len, 
+    len += sprintf(buf + len, "BSSID                = %s\n",
-                   "BSSID                = %02x:%02x:%02x:%02x:%02x:%02x\n",
+                   print_mac(mac, p));
-                   p[0],p[1],p[2],p[3],p[4],p[5]);
    len += sprintf(buf + len, "Country code         = %d\n", 
                   local->sparm.b5.a_curr_country_code);
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index 38e2188937c5..398c20105c81 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -1362,8 +1362,10 @@ static int rt2400pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         */
        mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
        if (!is_valid_ether_addr(mac)) {
+                DECLARE_MAC_BUF(macbuf);
                random_ether_addr(mac);
-                EEPROM(rt2x00dev, "MAC: " MAC_FMT "\n", MAC_ARG(mac));
+                EEPROM(rt2x00dev, "MAC: %s\n", print_mac(macbuf, mac));
        }
        rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index f6115c626fa7..e8d63aaab7bc 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1509,8 +1509,11 @@ static int rt2500pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         */
        mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
        if (!is_valid_ether_addr(mac)) {
+                DECLARE_MAC_BUF(macbuf);
                random_ether_addr(mac);
-                EEPROM(rt2x00dev, "MAC: " MAC_FMT "\n", MAC_ARG(mac));
+                EEPROM(rt2x00dev, "MAC: %s\n",
+                       print_mac(macbuf, mac));
        }
        rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 847bd7f58eed..614600c5510d 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1233,8 +1233,10 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         */
        mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
        if (!is_valid_ether_addr(mac)) {
+                DECLARE_MAC_BUF(macbuf);
                random_ether_addr(mac);
-                EEPROM(rt2x00dev, "MAC: " MAC_FMT "\n", MAC_ARG(mac));
+                EEPROM(rt2x00dev, "MAC: %s\n", print_mac(macbuf, mac));
        }
        rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 730bed5a1984..09c8c96e2f83 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2019,8 +2019,10 @@ static int rt61pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         */
        mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
        if (!is_valid_ether_addr(mac)) {
+                DECLARE_MAC_BUF(macbuf);
                random_ether_addr(mac);
-                EEPROM(rt2x00dev, "MAC: " MAC_FMT "\n", MAC_ARG(mac));
+                EEPROM(rt2x00dev, "MAC: %s\n", print_mac(macbuf, mac));
        }
        rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index b047c7c0f9ee..3397881bd63d 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1475,8 +1475,10 @@ static int rt73usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         */
        mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
        if (!is_valid_ether_addr(mac)) {
+                DECLARE_MAC_BUF(macbuf);
                random_ether_addr(mac);
-                EEPROM(rt2x00dev, "MAC: " MAC_FMT "\n", MAC_ARG(mac));
+                EEPROM(rt2x00dev, "MAC: %s\n", print_mac(macbuf, mac));
        }
        rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c
index 7dbf11e30db3..bf9f0cc5a645 100644
--- a/drivers/net/wireless/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl8187_dev.c
@@ -574,6 +574,7 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
        struct ieee80211_channel *channel;
        u16 txpwr, reg;
        int err, i;
+        DECLARE_MAC_BUF(mac);
        dev = ieee80211_alloc_hw(sizeof(*priv), &rtl8187_ops);
        if (!dev) {
@@ -681,8 +682,8 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
                goto err_free_dev;
        }
-        printk(KERN_INFO "%s: hwaddr " MAC_FMT ", rtl8187 V%d + %s\n",
+        printk(KERN_INFO "%s: hwaddr %s, rtl8187 V%d + %s\n",
-               wiphy_name(dev->wiphy), MAC_ARG(dev->wiphy->perm_addr),
+               wiphy_name(dev->wiphy), print_mac(mac, dev->wiphy->perm_addr),
               priv->asic_rev, priv->rf_init == rtl8225_rf_init ?
               "rtl8225" : "rtl8225z2");
diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c
index 33ed9fe95f3d..a1f8a1687842 100644
--- a/drivers/net/wireless/wavelan.c
+++ b/drivers/net/wireless/wavelan.c
@@ -880,6 +880,8 @@ static void wv_82586_reconfig(struct net_device * dev)
 */
 static void wv_psa_show(psa_t * p)
 {
+        DECLARE_MAC_BUF(mac);
        printk(KERN_DEBUG "##### WaveLAN PSA contents: #####\n");
        printk(KERN_DEBUG "psa_io_base_addr_1: 0x%02X %02X %02X %02X\n",
               p->psa_io_base_addr_1,
@@ -891,22 +893,13 @@ static void wv_psa_show(psa_t * p)
        printk(KERN_DEBUG "psa_holi_params: 0x%02x, ", p->psa_holi_params);
        printk("psa_int_req_no: %d\n", p->psa_int_req_no);
 #ifdef DEBUG_SHOW_UNUSED
-        printk(KERN_DEBUG
+        printk(KERN_DEBUG "psa_unused0[]: %s\n",
-               "psa_unused0[]: %02X:%02X:%02X:%02X:%02X:%02X:%02X\n",
+               print_mac(mac, p->psa_unused0));
-               p->psa_unused0[0], p->psa_unused0[1], p->psa_unused0[2],
-               p->psa_unused0[3], p->psa_unused0[4], p->psa_unused0[5],
-               p->psa_unused0[6]);
 #endif                          /* DEBUG_SHOW_UNUSED */
-        printk(KERN_DEBUG
+        printk(KERN_DEBUG "psa_univ_mac_addr[]: %s\n",
-               "psa_univ_mac_addr[]: %02x:%02x:%02x:%02x:%02x:%02x\n",
+               print_mac(mac, p->psa_univ_mac_addr));
-               p->psa_univ_mac_addr[0], p->psa_univ_mac_addr[1],
+        printk(KERN_DEBUG "psa_local_mac_addr[]: %s\n",
-               p->psa_univ_mac_addr[2], p->psa_univ_mac_addr[3],
+               print_mac(mac, p->psa_local_mac_addr));
-               p->psa_univ_mac_addr[4], p->psa_univ_mac_addr[5]);
-        printk(KERN_DEBUG
-               "psa_local_mac_addr[]: %02x:%02x:%02x:%02x:%02x:%02x\n",
-               p->psa_local_mac_addr[0], p->psa_local_mac_addr[1],
-               p->psa_local_mac_addr[2], p->psa_local_mac_addr[3],
-               p->psa_local_mac_addr[4], p->psa_local_mac_addr[5]);
        printk(KERN_DEBUG "psa_univ_local_sel: %d, ",
               p->psa_univ_local_sel);
        printk("psa_comp_number: %d, ", p->psa_comp_number);
@@ -1248,14 +1241,14 @@ static inline void wv_packet_info(u8 * p,	/* Packet to dump */
 {                               /* Name of the function */
        int i;
        int maxi;
+        DECLARE_MAC_BUF(mac);
        printk(KERN_DEBUG
-               "%s: %s(): dest %02X:%02X:%02X:%02X:%02X:%02X, length %d\n",
+               "%s: %s(): dest %s, length %d\n",
-               msg1, msg2, p[0], p[1], p[2], p[3], p[4], p[5], length);
+               msg1, msg2, print_mac(mac, p), length);
        printk(KERN_DEBUG
-               "%s: %s(): src %02X:%02X:%02X:%02X:%02X:%02X, type 0x%02X%02X\n",
+               "%s: %s(): src %s, type 0x%02X%02X\n",
-               msg1, msg2, p[6], p[7], p[8], p[9], p[10], p[11], p[12],
+               msg1, msg2, print_mac(mac, &p[6]), p[12], p[13]);
-               p[13]);
 #ifdef DEBUG_PACKET_DUMP
@@ -1286,7 +1279,9 @@ static void wv_init_info(struct net_device * dev)
        short ioaddr = dev->base_addr;
        net_local *lp = (net_local *) dev->priv;
        psa_t psa;
-        int i;
+#ifdef DEBUG_BASIC_SHOW
+        DECLARE_MAC_BUF(mac);
+#endif
        /* Read the parameter storage area */
        psa_read(ioaddr, lp->hacr, 0, (unsigned char *) &psa, sizeof(psa));
@@ -1303,10 +1298,8 @@ static void wv_init_info(struct net_device * dev)
 #ifdef DEBUG_BASIC_SHOW
        /* Now, let's go for the basic stuff. */
-        printk(KERN_NOTICE "%s: WaveLAN at %#x,", dev->name, ioaddr);
+        printk(KERN_NOTICE "%s: WaveLAN at %#x, %s, IRQ %d",
-        for (i = 0; i < WAVELAN_ADDR_SIZE; i++)
+               dev->name, ioaddr, print_mac(mac, dev->dev_addr), dev->irq);
-                printk("%s%02X", (i == 0) ? " " : ":", dev->dev_addr[i]);
-        printk(", IRQ %d", dev->irq);
        /* Print current network ID. */
        if (psa.psa_nwid_select)
@@ -3596,15 +3589,15 @@ static void wv_82586_config(struct net_device * dev)
                              WAVELAN_ADDR_SIZE >> 1);
 #ifdef DEBUG_CONFIG_INFO
+ {
+                DECLARE_MAC_BUF(mac);
                printk(KERN_DEBUG
                       "%s: wv_82586_config(): set %d multicast addresses:\n",
                       dev->name, lp->mc_count);
                for (dmi = dev->mc_list; dmi; dmi = dmi->next)
-                        printk(KERN_DEBUG
+                        printk(KERN_DEBUG " %s\n",
-                               " %02x:%02x:%02x:%02x:%02x:%02x\n",
+                               print_mac(mac, dmi->dmi_addr));
-                               dmi->dmi_addr[0], dmi->dmi_addr[1],
+ }
-                               dmi->dmi_addr[2], dmi->dmi_addr[3],
-                               dmi->dmi_addr[4], dmi->dmi_addr[5]);
 #endif
        }
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index 9b7f44957869..577c647824fe 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -1042,6 +1042,7 @@ wv_82593_reconfig(struct net_device *	dev)
 static void
 wv_psa_show(psa_t *     p)
 {
+  DECLARE_MAC_BUF(mac);
  printk(KERN_DEBUG "##### wavelan psa contents: #####\n");
  printk(KERN_DEBUG "psa_io_base_addr_1: 0x%02X %02X %02X %02X\n",
         p->psa_io_base_addr_1,
@@ -1055,29 +1056,13 @@ wv_psa_show(psa_t *	p)
  printk(KERN_DEBUG "psa_holi_params: 0x%02x, ", p->psa_holi_params);
  printk("psa_int_req_no: %d\n", p->psa_int_req_no);
 #ifdef DEBUG_SHOW_UNUSED
-  printk(KERN_DEBUG "psa_unused0[]: %02X:%02X:%02X:%02X:%02X:%02X:%02X\n",
+  printk(KERN_DEBUG "psa_unused0[]: %s\n",
-         p->psa_unused0[0],
+         print_mac(mac, p->psa_unused0));
-         p->psa_unused0[1],
-         p->psa_unused0[2],
-         p->psa_unused0[3],
-         p->psa_unused0[4],
-         p->psa_unused0[5],
-         p->psa_unused0[6]);
 #endif  /* DEBUG_SHOW_UNUSED */
-  printk(KERN_DEBUG "psa_univ_mac_addr[]: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  printk(KERN_DEBUG "psa_univ_mac_addr[]: %s\n",
-         p->psa_univ_mac_addr[0],
+         print_mac(mac, p->psa_univ_mac_addr));
-         p->psa_univ_mac_addr[1],
+  printk(KERN_DEBUG "psa_local_mac_addr[]: %s\n",
-         p->psa_univ_mac_addr[2],
+         print_mac(mac, p->psa_local_mac_addr));
-         p->psa_univ_mac_addr[3],
-         p->psa_univ_mac_addr[4],
-         p->psa_univ_mac_addr[5]);
-  printk(KERN_DEBUG "psa_local_mac_addr[]: %02x:%02x:%02x:%02x:%02x:%02x\n",
-         p->psa_local_mac_addr[0],
-         p->psa_local_mac_addr[1],
-         p->psa_local_mac_addr[2],
-         p->psa_local_mac_addr[3],
-         p->psa_local_mac_addr[4],
-         p->psa_local_mac_addr[5]);
  printk(KERN_DEBUG "psa_univ_local_sel: %d, ", p->psa_univ_local_sel);
  printk("psa_comp_number: %d, ", p->psa_comp_number);
  printk("psa_thr_pre_set: 0x%02x\n", p->psa_thr_pre_set);
@@ -1277,11 +1262,12 @@ wv_packet_info(u_char *		p,		/* Packet to dump */
 {
  int           i;
  int           maxi;
+  DECLARE_MAC_BUF(mac);
-  printk(KERN_DEBUG "%s: %s(): dest %02X:%02X:%02X:%02X:%02X:%02X, length %d\n",
+  printk(KERN_DEBUG "%s: %s(): dest %s, length %d\n",
-         msg1, msg2, p[0], p[1], p[2], p[3], p[4], p[5], length);
+         msg1, msg2, print_mac(mac, p), length);
-  printk(KERN_DEBUG "%s: %s(): src %02X:%02X:%02X:%02X:%02X:%02X, type 0x%02X%02X\n",
+  printk(KERN_DEBUG "%s: %s(): src %s, type 0x%02X%02X\n",
-         msg1, msg2, p[6], p[7], p[8], p[9], p[10], p[11], p[12], p[13]);
+         msg1, msg2, print_mac(mac, &p[6]), p[12], p[13]);
 #ifdef DEBUG_PACKET_DUMP
@@ -1312,7 +1298,7 @@ wv_init_info(struct net_device *	dev)
 {
  kio_addr_t    base = dev->base_addr;
  psa_t         psa;
-  int           i;
+  DECLARE_MAC_BUF(mac);
  /* Read the parameter storage area */
  psa_read(dev, 0, (unsigned char *) &psa, sizeof(psa));
@@ -1329,10 +1315,10 @@ wv_init_info(struct net_device *	dev)
 #ifdef DEBUG_BASIC_SHOW
  /* Now, let's go for the basic stuff */
-  printk(KERN_NOTICE "%s: WaveLAN: port %#lx, irq %d, hw_addr",
+  printk(KERN_NOTICE "%s: WaveLAN: port %#lx, irq %d, "
-         dev->name, base, dev->irq);
+         "hw_addr %s",
-  for(i = 0; i < WAVELAN_ADDR_SIZE; i++)
+         dev->name, base, dev->irq,
-    printk("%s%02X", (i == 0) ? " " : ":", dev->dev_addr[i]);
+         print_mac(mac, dev->dev_addr));
  /* Print current network id */
  if(psa.psa_nwid_select)
@@ -3691,12 +3677,12 @@ wv_82593_config(struct net_device *	dev)
      int                       addrs_len = WAVELAN_ADDR_SIZE * lp->mc_count;
 #ifdef DEBUG_CONFIG_INFO
+      DECLARE_MAC_BUF(mac);
      printk(KERN_DEBUG "%s: wv_hw_config(): set %d multicast addresses:\n",
             dev->name, lp->mc_count);
      for(dmi=dev->mc_list; dmi; dmi=dmi->next)
-        printk(KERN_DEBUG " %02x:%02x:%02x:%02x:%02x:%02x\n",
+        printk(KERN_DEBUG " %s\n",
-               dmi->dmi_addr[0], dmi->dmi_addr[1], dmi->dmi_addr[2],
+               print_mac(mac, dmi->dmi_addr));
-               dmi->dmi_addr[3], dmi->dmi_addr[4], dmi->dmi_addr[5] );
 #endif
      /* Initialize adapter's ethernet multicast addresses */
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 2690f291e3f7..42a36b3f3ff7 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -860,11 +860,10 @@ static int wl3501_esbq_confirm(struct wl3501_card *this)
 static void wl3501_online(struct net_device *dev)
 {
        struct wl3501_card *this = netdev_priv(dev);
+        DECLARE_MAC_BUF(mac);
-        printk(KERN_INFO "%s: Wireless LAN online. BSSID: "
+        printk(KERN_INFO "%s: Wireless LAN online. BSSID: %s\n",
-               "%02X %02X %02X %02X %02X %02X\n", dev->name,
+               dev->name, print_mac(mac, this->bssid));
-               this->bssid[0], this->bssid[1], this->bssid[2],
-               this->bssid[3], this->bssid[4], this->bssid[5]);
        netif_wake_queue(dev);
 }
@@ -1966,6 +1965,7 @@ static int wl3501_config(struct pcmcia_device *link)
        struct net_device *dev = link->priv;
        int i = 0, j, last_fn, last_ret;
        struct wl3501_card *this;
+        DECLARE_MAC_BUF(mac);
        /* Try allocating IO ports.  This tries a few fixed addresses.  If you
         * want, you can also read the card's config table to pick addresses --
@@ -2019,14 +2019,14 @@ static int wl3501_config(struct pcmcia_device *link)
        }
        strcpy(this->node.dev_name, dev->name);
-        /* print probe information */
+        for (i = 0; i < 6; i++)
-        printk(KERN_INFO "%s: wl3501 @ 0x%3.3x, IRQ %d, MAC addr in flash ROM:",
-               dev->name, this->base_addr, (int)dev->irq);
-        for (i = 0; i < 6; i++) {
                dev->dev_addr[i] = ((char *)&this->mac_addr)[i];
-                printk("%c%02x", i ? ':' : ' ', dev->dev_addr[i]);
-        }
+        /* print probe information */
-        printk("\n");
+        printk(KERN_INFO "%s: wl3501 @ 0x%3.3x, IRQ %d, "
+               "MAC addr in flash ROM:%s\n",
+               dev->name, this->base_addr, (int)dev->irq,
+               print_mac(mac, dev->dev_addr));
        /*
         * Initialize card parameters - added by jss
         */
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 495904218b1b..750c0f99e86f 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -377,6 +377,7 @@ int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr)
                [0] = { .addr = CR_MAC_ADDR_P1 },
                [1] = { .addr = CR_MAC_ADDR_P2 },
        };
+        DECLARE_MAC_BUF(mac);
        reqs[0].value = (mac_addr[3] << 24)
                      | (mac_addr[2] << 16)
@@ -386,7 +387,7 @@ int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr)
                      |  mac_addr[4];
        dev_dbg_f(zd_chip_dev(chip),
-                "mac addr " MAC_FMT "\n", MAC_ARG(mac_addr));
+                "mac addr %s\n", print_mac(mac, mac_addr));
        mutex_lock(&chip->mutex);
        r = zd_iowrite32a_locked(chip, reqs, ARRAY_SIZE(reqs));
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 451308d7095d..06b342b39792 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -289,12 +289,13 @@ int zd_mac_set_mac_address(struct net_device *netdev, void *p)
        struct sockaddr *addr = p;
        struct zd_mac *mac = zd_netdev_mac(netdev);
        struct zd_chip *chip = &mac->chip;
+        DECLARE_MAC_BUF(mac2);
        if (!is_valid_ether_addr(addr->sa_data))
                return -EADDRNOTAVAIL;
        dev_dbg_f(zd_mac_dev(mac),
-                  "Setting MAC to " MAC_FMT "\n", MAC_ARG(addr->sa_data));
+                  "Setting MAC to %s\n", print_mac(mac2, addr->sa_data));
        if (netdev->flags & IFF_UP) {
                r = zd_write_mac_addr(chip, addr->sa_data);
@@ -329,6 +330,7 @@ void zd_mac_set_multicast_list(struct net_device *dev)
        struct zd_mc_hash hash;
        struct dev_mc_list *mc;
        unsigned long flags;
+        DECLARE_MAC_BUF(mac2);
        if (dev->flags & (IFF_PROMISC|IFF_ALLMULTI) ||
                        ieee->iw_mode == IW_MODE_MONITOR) {
@@ -336,8 +338,8 @@ void zd_mac_set_multicast_list(struct net_device *dev)
        } else {
                zd_mc_clear(&hash);
                for (mc = dev->mc_list; mc; mc = mc->next) {
-                        dev_dbg_f(zd_mac_dev(mac), "mc addr " MAC_FMT "\n",
+                        dev_dbg_f(zd_mac_dev(mac), "mc addr %s\n",
-                                  MAC_ARG(mc->dmi_addr));
+                                  print_mac(mac2, mc->dmi_addr));
                        zd_mc_add_addr(&hash, mc->dmi_addr);
                }
        }