[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()

This is nicer than the MAC_FMT stuff.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

228 files changed, 1875 insertions, 1952 deletions

diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c
index f9e7ffbcb772..9c23336750e2 100644
--- a/drivers/net/3c503.c
+++ b/drivers/net/3c503.c
@@ -177,6 +177,7 @@ el2_probe1(struct net_device *dev, int ioaddr)
     int i, iobase_reg, membase_reg, saved_406, wordlength, retval;
     static unsigned version_printed;
     unsigned long vendor_id;
+    DECLARE_MAC_BUF(mac);
 
     if (!request_region(ioaddr, EL2_IO_EXTENT, DRV_NAME))
         return -EBUSY;
@@ -226,7 +227,8 @@ el2_probe1(struct net_device *dev, int ioaddr)
 
     /* Retrieve and print the ethernet address. */
     for (i = 0; i < 6; i++)
-        printk(" %2.2x", dev->dev_addr[i] = inb(ioaddr + i));
+        dev->dev_addr[i] = inb(ioaddr + i);
+    printk("%s", print_mac(mac, dev->dev_addr));
 
     /* Map the 8390 back into the window. */
     outb(ECNTRL_THIN, ioaddr + 0x406);
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c
index c05bb3fc57a2..9c6573419f5a 100644
--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
@@ -1386,6 +1386,7 @@ static int __init elplus_setup(struct net_device *dev)
         unsigned long timeout;
         unsigned long cookie = 0;
         int err = -ENODEV;
+        DECLARE_MAC_BUF(mac);
 
         /*
          *  setup adapter structure
@@ -1521,11 +1522,10 @@ static int __init elplus_setup(struct net_device *dev)
         /*
          * print remainder of startup message
          */
-        printk(KERN_INFO "%s: 3c505 at %#lx, irq %d, dma %d, ",
-               dev->name, dev->base_addr, dev->irq, dev->dma);
-        printk("addr %02x:%02x:%02x:%02x:%02x:%02x, ",
-               dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-               dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+        printk(KERN_INFO "%s: 3c505 at %#lx, irq %d, dma %d, "
+               "addr %s, ",
+               dev->name, dev->base_addr, dev->irq, dev->dma,
+               print_mac(mac, dev->dev_addr));
 
         /*
          * read more information from the adapter
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index 3d06271c3a8b..964d31ac9449 100644
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -357,6 +357,7 @@ static int __init el16_probe1(struct net_device *dev, int ioaddr)
         static unsigned char init_ID_done, version_printed;
         int i, irq, irqval, retval;
         struct net_local *lp;
+        DECLARE_MAC_BUF(mac);
 
         if (init_ID_done == 0) {
                 ushort lrs_state = 0xff;
@@ -402,10 +403,9 @@ static int __init el16_probe1(struct net_device *dev, int ioaddr)
         dev->base_addr = ioaddr;
 
         outb(0x01, ioaddr + MISC_CTRL);
-        for (i = 0; i < 6; i++) {
+        for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = inb(ioaddr + i);
-                printk(" %02x", dev->dev_addr[i]);
-        }
+        printk(" %s", print_mac(mac, dev->dev_addr));
 
         if (mem_start)
                 net_debug = mem_start & 7;
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index 7466987d8451..c576fe76d54f 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -313,8 +313,9 @@ static int nopnp;
 static int __init el3_common_init(struct net_device *dev)
 {
         struct el3_private *lp = netdev_priv(dev);
-        short i;
         int err;
+        DECLARE_MAC_BUF(mac);
+        const char *if_names[] = {"10baseT", "AUI", "undefined", "BNC"};
 
         spin_lock_init(&lp->lock);
 
@@ -346,17 +347,10 @@ static int __init el3_common_init(struct net_device *dev)
                 return err;
         }
 
-        {
-                const char *if_names[] = {"10baseT", "AUI", "undefined", "BNC"};
-                printk("%s: 3c5x9 found at %#3.3lx, %s port, address ",
-                        dev->name, dev->base_addr,
-                        if_names[(dev->if_port & 0x03)]);
-        }
-
-        /* Read in the station address. */
-        for (i = 0; i < 6; i++)
-                printk(" %2.2x", dev->dev_addr[i]);
-        printk(", IRQ %d.\n", dev->irq);
+        printk(KERN_INFO "%s: 3c5x9 found at %#3.3lx, %s port, "
+               "address %s, IRQ %d.\n",
+               dev->name, dev->base_addr, if_names[(dev->if_port & 0x03)],
+               print_mac(mac, dev->dev_addr), dev->irq);
 
         if (el3_debug > 0)
                 printk(KERN_INFO "%s", version);
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 38a2ebea9b45..275e7510ebaf 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -569,6 +569,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
         unsigned int eeprom[0x40], checksum = 0;        /* EEPROM contents */
         int i;
         int irq;
+        DECLARE_MAC_BUF(mac);
 
         if (idev) {
                 irq = pnp_irq(idev, 0);
@@ -630,8 +631,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
         checksum = (checksum ^ (checksum >> 8)) & 0xff;
         if (checksum != 0x00)
                 printk(" ***INVALID CHECKSUM %4.4x*** ", checksum);
-        for (i = 0; i < 6; i++)
-                printk("%c%2.2x", i ? ':' : ' ', dev->dev_addr[i]);
+        printk(" %s", print_mac(mac, dev->dev_addr));
         if (eeprom[16] == 0x11c7) {     /* Corkscrew */
                 if (request_dma(dev->dma, "3c515")) {
                         printk(", DMA %d allocation failed", dev->dma);
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index 10852b2a40ab..239fc42fb8df 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -383,8 +383,8 @@ void alloc586(struct net_device *dev)
 static int elmc_getinfo(char *buf, int slot, void *d)
 {
         int len = 0;
-        struct net_device *dev = (struct net_device *) d;
-        int i;
+        struct net_device *dev = d;
+        DECLARE_MAC_BUF(mac);
 
         if (dev == NULL)
                 return len;
@@ -399,12 +399,8 @@ static int elmc_getinfo(char *buf, int slot, void *d)
         len += sprintf(buf + len, "Transceiver: %s\n", dev->if_port ?
                        "External" : "Internal");
         len += sprintf(buf + len, "Device: %s\n", dev->name);
-        len += sprintf(buf + len, "Hardware Address:");
-        for (i = 0; i < 6; i++) {
-                len += sprintf(buf + len, " %02x", dev->dev_addr[i]);
-        }
-        buf[len++] = '\n';
-        buf[len] = 0;
+        len += sprintf(buf + len, "Hardware Address: %s\n",
+                       print_mac(mac, dev->dev_addr));
 
         return len;
 }                               /* elmc_getinfo() */
@@ -422,6 +418,7 @@ static int __init do_elmc_probe(struct net_device *dev)
         unsigned int size = 0;
         int retval;
         struct priv *pr = dev->priv;
+        DECLARE_MAC_BUF(mac);
 
         if (MCA_bus == 0) {
                 return -ENODEV;
@@ -544,12 +541,11 @@ static int __init do_elmc_probe(struct net_device *dev)
 
         /* The hardware address for the 3c523 is stored in the first six
            bytes of the IO address. */
-        printk(KERN_INFO "%s: hardware address ", dev->name);
-        for (i = 0; i < 6; i++) {
+        for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = inb(dev->base_addr + i);
-                printk(" %02x", dev->dev_addr[i]);
-        }
-        printk("\n");
+
+        printk(KERN_INFO "%s: hardware address %s\n",
+               dev->name, print_mac(mac, dev->dev_addr));
 
         dev->open = &elmc_open;
         dev->stop = &elmc_close;
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index 5b5f44cdfc1d..b72b89d53ec8 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -336,6 +336,7 @@ static int __init mc32_probe1(struct net_device *dev, int slot)
                 "82586 initialisation failure",
                 "Adapter list configuration error"
         };
+        DECLARE_MAC_BUF(mac);
 
         /* Time to play MCA games */
 
@@ -396,17 +397,17 @@ static int __init mc32_probe1(struct net_device *dev, int slot)
          *      Go PROM browsing
          */
 
-        printk("%s: Address ", dev->name);
-
         /* Retrieve and print the ethernet address. */
         for (i = 0; i < 6; i++)
         {
                 mca_write_pos(slot, 6, i+12);
                 mca_write_pos(slot, 7, 0);
 
-                printk(" %2.2x", dev->dev_addr[i] = mca_read_pos(slot,3));
+                dev->dev_addr[i] = mca_read_pos(slot,3);
         }
 
+        printk("%s: Address %s", dev->name, print_mac(mac, dev->dev_addr));
+
         mca_write_pos(slot, 6, 0);
         mca_write_pos(slot, 7, 0);
 
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index ad0f6a729d29..58311199e321 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -1014,6 +1014,7 @@ static int __devinit vortex_probe1(struct device *gendev,
         char *print_name = "3c59x";
         struct pci_dev *pdev = NULL;
         struct eisa_device *edev = NULL;
+        DECLARE_MAC_BUF(mac);
 
         if (!printed_version) {
                 printk (version);
@@ -1205,10 +1206,8 @@ static int __devinit vortex_probe1(struct device *gendev,
         for (i = 0; i < 3; i++)
                 ((u16 *)dev->dev_addr)[i] = htons(eeprom[i + 10]);
         memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
-        if (print_info) {
-                for (i = 0; i < 6; i++)
-                        printk("%c%2.2x", i ? ':' : ' ', dev->dev_addr[i]);
-        }
+        if (print_info)
+                printk(" %s", print_mac(mac, dev->dev_addr));
         /* Unfortunately an all zero eeprom passes the checksum and this
            gets found in the wild in failure cases. Crypto is hard 8) */
         if (!is_valid_ether_addr(dev->dev_addr)) {
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 58fad1b2f72e..7edd50cf7776 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -1823,6 +1823,7 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         void __iomem *regs;
         resource_size_t pciaddr;
         unsigned int addr_len, i, pci_using_dac;
+        DECLARE_MAC_BUF(mac);
 
 #ifndef MODULE
         static int version_printed;
@@ -1964,13 +1965,10 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err_out_iomap;
 
         printk (KERN_INFO "%s: RTL-8139C+ at 0x%lx, "
-                "%02x:%02x:%02x:%02x:%02x:%02x, "
-                "IRQ %d\n",
+                "%s, IRQ %d\n",
                 dev->name,
                 dev->base_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],
+                print_mac(mac, dev->dev_addr),
                 dev->irq);
 
         pci_set_drvdata(pdev, dev);
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 28c1aaf1fe1d..d3088a786e26 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -926,6 +926,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
         int i, addr_len, option;
         void __iomem *ioaddr;
         static int board_idx = -1;
+        DECLARE_MAC_BUF(mac);
 
         assert (pdev != NULL);
         assert (ent != NULL);
@@ -1017,14 +1018,11 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
         pci_set_drvdata (pdev, dev);
 
         printk (KERN_INFO "%s: %s at 0x%lx, "
-                "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, "
-                "IRQ %d\n",
+                "%s, IRQ %d\n",
                 dev->name,
                 board_info[ent->driver_data].name,
                 dev->base_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],
+                print_mac(mac, dev->dev_addr),
                 dev->irq);
 
         printk (KERN_DEBUG "%s:  Identified 8139 chip type '%s'\n",
diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index 6b03416731de..bb30d5be7824 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -1116,15 +1116,12 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 static void print_eth(unsigned char *add, char *str)
 {
-        int i;
+        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mac2);
 
-        printk(KERN_DEBUG "i596 0x%p, ", add);
-        for (i = 0; i < 6; i++)
-                printk(" %02X", add[i + 6]);
-        printk(" -->");
-        for (i = 0; i < 6; i++)
-                printk(" %02X", add[i]);
-        printk(" %02X%02X, %s\n", add[12], add[13], str);
+        printk(KERN_DEBUG "i596 0x%p, %s --> %s %02X%02X, %s\n",
+               add, print_mac(mac, add + 6), print_mac(mac2, add),
+               add[12], add[13], str);
 }
 
 static int io = 0x300;
@@ -1539,6 +1536,7 @@ static void set_multicast_list(struct net_device *dev)
                 struct dev_mc_list *dmi;
                 unsigned char *cp;
                 struct mc_cmd *cmd;
+                DECLARE_MAC_BUF(mac);
 
                 if (wait_cfg(dev, &lp->mc_cmd.cmd, 1000, "multicast list change request timed out"))
                         return;
@@ -1549,8 +1547,8 @@ static void set_multicast_list(struct net_device *dev)
                 for (dmi = dev->mc_list; cnt && dmi != NULL; dmi = dmi->next, cnt--, cp += 6) {
                         memcpy(cp, dmi->dmi_addr, 6);
                         if (i596_debug > 1)
-                                DEB(DEB_MULTI,printk(KERN_INFO "%s: Adding address %02x:%02x:%02x:%02x:%02x:%02x\n",
-                                                dev->name, cp[0],cp[1],cp[2],cp[3],cp[4],cp[5]));
+                                DEB(DEB_MULTI,printk(KERN_INFO "%s: Adding address %s\n",
+                                                dev->name, print_mac(mac, cp)));
                 }
                 i596_add_cmd(dev, &cmd->cmd);
         }
diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index 77773ce52eff..18f7f815f66e 100644
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -716,6 +716,7 @@ static int __devinit a2065_init_one(struct zorro_dev *z,
         unsigned long board, base_addr, mem_start;
         struct resource *r1, *r2;
         int err;
+        DECLARE_MAC_BUF(mac);
 
         board = z->resource.start;
         base_addr = board+A2065_LANCE;
@@ -792,9 +793,8 @@ static int __devinit a2065_init_one(struct zorro_dev *z,
         zorro_set_drvdata(z, dev);
 
         printk(KERN_INFO "%s: A2065 at 0x%08lx, Ethernet Address "
-               "%02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, board,
-               dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-               dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+               "%s\n", dev->name, board,
+               print_mac(mac, dev->dev_addr));
 
         return 0;
 }
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c
index 65b2de56ed22..5136d94923aa 100644
--- a/drivers/net/ac3200.c
+++ b/drivers/net/ac3200.c
@@ -146,6 +146,7 @@ out:
 static int __init ac_probe1(int ioaddr, struct net_device *dev)
 {
         int i, retval;
+        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, AC_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -167,10 +168,11 @@ static int __init ac_probe1(int ioaddr, struct net_device *dev)
                    inb(ioaddr + AC_ID_PORT + 2), inb(ioaddr + AC_ID_PORT + 3));
 #endif
 
-        printk("AC3200 in EISA slot %d, node", ioaddr/0x1000);
-        for(i = 0; i < 6; i++)
-                printk(" %02x", dev->dev_addr[i] = inb(ioaddr + AC_SA_PROM + i));
+        for (i = 0; i < 6; i++)
+                dev->dev_addr[i] = inb(ioaddr + AC_SA_PROM + i);
 
+        printk(KERN_DEBUG "AC3200 in EISA slot %d, node %s",
+               ioaddr/0x1000, print_mac(mac, dev->dev_addr));
 #if 0
         /* Check the vendor ID/prefix. Redundant after checking the EISA ID */
         if (inb(ioaddr + AC_SA_PROM + 0) != AC_ADDR0
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index ca00f41e4d85..2c2ed6dc98bc 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -893,6 +893,7 @@ static int __devinit ace_init(struct net_device *dev)
         int board_idx, ecode = 0;
         short i;
         unsigned char cache_size;
+        DECLARE_MAC_BUF(mac);
 
         ap = netdev_priv(dev);
         regs = ap->regs;
@@ -1012,10 +1013,6 @@ static int __devinit ace_init(struct net_device *dev)
         writel(mac1, &regs->MacAddrHi);
         writel(mac2, &regs->MacAddrLo);
 
-        printk("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
-               (mac1 >> 8) & 0xff, mac1 & 0xff, (mac2 >> 24) &0xff,
-               (mac2 >> 16) & 0xff, (mac2 >> 8) & 0xff, mac2 & 0xff);
-
         dev->dev_addr[0] = (mac1 >> 8) & 0xff;
         dev->dev_addr[1] = mac1 & 0xff;
         dev->dev_addr[2] = (mac2 >> 24) & 0xff;
@@ -1023,6 +1020,8 @@ static int __devinit ace_init(struct net_device *dev)
         dev->dev_addr[4] = (mac2 >> 8) & 0xff;
         dev->dev_addr[5] = mac2 & 0xff;
 
+        printk("MAC: %s\n", print_mac(mac, dev->dev_addr));
+
         /*
          * Looks like this is necessary to deal with on all architectures,
          * even this %$#%$# N440BX Intel based thing doesn't get it right.
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index afb60a5927ae..73f40a45441a 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -1934,6 +1934,7 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
         unsigned long reg_addr,reg_len;
         struct amd8111e_priv* lp;
         struct net_device* dev;
+        DECLARE_MAC_BUF(mac);
 
         err = pci_enable_device(pdev);
         if(err){
@@ -2006,7 +2007,7 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
 
         /* Initializing MAC address */
         for(i = 0; i < ETH_ADDR_LEN; i++)
-                        dev->dev_addr[i] =readb(lp->mmio + PADR + i);
+                dev->dev_addr[i] = readb(lp->mmio + PADR + i);
 
         /* Setting user defined parametrs */
         lp->ext_phy_option = speed_duplex[card_idx];
@@ -2075,11 +2076,10 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
         /*  display driver and device information */
 
         chip_version = (readl(lp->mmio + CHIPID) & 0xf0000000)>>28;
-        printk(KERN_INFO "%s: AMD-8111e Driver Version: %s\n",                                                           dev->name,MODULE_VERS);
-        printk(KERN_INFO "%s: [ Rev %x ] PCI 10/100BaseT Ethernet ",                                                    dev->name, chip_version);
-        for (i = 0; i < 6; i++)
-                printk("%2.2x%c",dev->dev_addr[i],i == 5 ? ' ' : ':');
-        printk( "\n");
+        printk(KERN_INFO "%s: AMD-8111e Driver Version: %s\n",
+               dev->name,MODULE_VERS);
+        printk(KERN_INFO "%s: [ Rev %x ] PCI 10/100BaseT Ethernet %s\n",
+               dev->name, chip_version, print_mac(mac, dev->dev_addr));
         if (lp->ext_phy_id)
                 printk(KERN_INFO "%s: Found MII PHY ID 0x%08x at address 0x%02x\n",
                        dev->name, lp->ext_phy_id, lp->ext_phy_addr);
diff --git a/drivers/net/apne.c b/drivers/net/apne.c
index b5a974a964c2..c12cbdf368b1 100644
--- a/drivers/net/apne.c
+++ b/drivers/net/apne.c
@@ -204,6 +204,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
     int neX000, ctron;
 #endif
     static unsigned version_printed;
+    DECLARE_MAC_BUF(mac);
 
     if (ei_debug  &&  version_printed++ == 0)
         printk(version);
@@ -316,12 +317,12 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
     i = request_irq(dev->irq, apne_interrupt, IRQF_SHARED, DRV_NAME, dev);
     if (i) return i;
 
-    for(i = 0; i < ETHER_ADDR_LEN; i++) {
-        printk(" %2.2x", SA_prom[i]);
+    for(i = 0; i < ETHER_ADDR_LEN; i++)
         dev->dev_addr[i] = SA_prom[i];
-    }
 
-    printk("\n%s: %s found.\n", dev->name, name);
+    printk(" %s\n", print_mac(mac, dev->dev_addr));
+
+    printk("%s: %s found.\n", dev->name, name);
 
     ei_status.name = name;
     ei_status.tx_start_page = start_page;
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index 2c020a36177e..3fa3bccd1adb 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -166,6 +166,7 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
     struct net_device *dev;
     struct ariadne_private *priv;
     int err;
+    DECLARE_MAC_BUF(mac);
 
     r1 = request_mem_region(base_addr, sizeof(struct Am79C960), "Am79C960");
     if (!r1)
@@ -216,9 +217,8 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
     zorro_set_drvdata(z, dev);
 
     printk(KERN_INFO "%s: Ariadne at 0x%08lx, Ethernet Address "
-           "%02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, board,
-           dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-           dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+           "%s\n", dev->name, board,
+           print_mac(mac, dev->dev_addr));
 
     return 0;
 }
@@ -614,21 +614,17 @@ static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev)
     /* Fill in a Tx ring entry */
 
 #if 0
-    printk(KERN_DEBUG "TX pkt type 0x%04x from ", ((u_short *)skb->data)[6]);
-    {
-        int i;
-        u_char *ptr = &((u_char *)skb->data)[6];
-        for (i = 0; i < 6; i++)
-            printk("%02x", ptr[i]);
-    }
-    printk(" to ");
-    {
-        int i;
-        u_char *ptr = (u_char *)skb->data;
-        for (i = 0; i < 6; i++)
-            printk("%02x", ptr[i]);
-    }
-    printk(" data 0x%08x len %d\n", (int)skb->data, (int)skb->len);
+{
+    DECLARE_MAC_BUF(mac);
+    DECLARE_MAC_BUF(mac2);
+
+    printk(KERN_DEBUG "TX pkt type 0x%04x from %s to %s "
+           " data 0x%08x len %d\n",
+           ((u_short *)skb->data)[6],
+           print_mac(mac, ((const u8 *)skb->data)+6),
+           print_mac(mac, (const u8 *)skb->data),
+           (int)skb->data, (int)skb->len);
+}
 #endif
 
     local_irq_save(flags);
@@ -748,22 +744,22 @@ static int ariadne_rx(struct net_device *dev)
             skb_copy_to_linear_data(skb, (char *)priv->rx_buff[entry], pkt_len);
             skb->protocol=eth_type_trans(skb,dev);
 #if 0
+{
+            DECLARE_MAC_BUF(mac);
+
             printk(KERN_DEBUG "RX pkt type 0x%04x from ",
                    ((u_short *)skb->data)[6]);
             {
-                int i;
                 u_char *ptr = &((u_char *)skb->data)[6];
-                for (i = 0; i < 6; i++)
-                    printk("%02x", ptr[i]);
+                printk("%s", print_mac(mac, ptr));
             }
             printk(" to ");
             {
-                int i;
                 u_char *ptr = (u_char *)skb->data;
-                for (i = 0; i < 6; i++)
-                    printk("%02x", ptr[i]);
+                printk("%s", print_mac(mac, ptr));
             }
             printk(" data 0x%08x len %d\n", (int)skb->data, (int)skb->len);
+}
 #endif
 
             netif_rx(skb);
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c
index 77964556776e..ba6bd03a015f 100644
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
@@ -741,12 +741,10 @@ static int __init am79c961_probe(struct platform_device *pdev)
 
         ret = register_netdev(dev);
         if (ret == 0) {
-                printk(KERN_INFO "%s: ether address ", dev->name);
-
-                /* Retrive and print the ethernet address. */
-                for (i = 0; i < 6; i++)
-                        printk (i == 5 ? "%02x\n" : "%02x:", dev->dev_addr[i]);
+                DECLARE_MAC_BUF(mac);
 
+                printk(KERN_INFO "%s: ether address %s\n",
+                       dev->name, print_mac(mac, dev->dev_addr));
                 return 0;
         }
 
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index 619810a01e5b..25b114a4e2b1 100644
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@ -485,6 +485,7 @@ static void update_mac_address(struct net_device *dev)
 static int set_mac_address(struct net_device *dev, void* addr)
 {
         struct sockaddr *address = addr;
+        DECLARE_MAC_BUF(mac);
 
         if (!is_valid_ether_addr(address->sa_data))
                 return -EADDRNOTAVAIL;
@@ -492,9 +493,8 @@ static int set_mac_address(struct net_device *dev, void* addr)
         memcpy(dev->dev_addr, address->sa_data, dev->addr_len);
         update_mac_address(dev);
 
-        printk("%s: Setting MAC address to %02x:%02x:%02x:%02x:%02x:%02x\n", dev->name,
-                dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-                dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+        printk("%s: Setting MAC address to %s\n", dev->name,
+               print_mac(mac, dev->dev_addr));
 
         return 0;
 }
@@ -979,6 +979,7 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
         struct at91_private *lp;
         unsigned int val;
         int res;
+        DECLARE_MAC_BUF(mac);
 
         dev = alloc_etherdev(sizeof(struct at91_private));
         if (!dev)
@@ -1081,12 +1082,11 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
         }
 
         /* Display ethernet banner */
-        printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%02x:%02x:%02x:%02x:%02x:%02x)\n",
-                dev->name, (uint) dev->base_addr, dev->irq,
-                at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_SPD ? "100-" : "10-",
-                at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_FD ? "FullDuplex" : "HalfDuplex",
-                dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-                dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+        printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%s)\n",
+               dev->name, (uint) dev->base_addr, dev->irq,
+               at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_SPD ? "100-" : "10-",
+               at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_FD ? "FullDuplex" : "HalfDuplex",
+               print_mac(mac, dev->dev_addr));
         if ((phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID))
                 printk(KERN_INFO "%s: Davicom 9161 PHY %s\n", dev->name, (lp->phy_media == PORT_FIBRE) ? "(Fiber)" : "(Copper)");
         else if (phy_type == MII_LXT971A_ID)
diff --git a/drivers/net/arm/ether1.c b/drivers/net/arm/ether1.c
index 6ec8a587c1d2..3bb9e293e2ef 100644
--- a/drivers/net/arm/ether1.c
+++ b/drivers/net/arm/ether1.c
@@ -996,6 +996,7 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         struct net_device *dev;
         int i, ret = 0;
+        DECLARE_MAC_BUF(mac);
 
         ether1_banner();
 
@@ -1043,12 +1044,9 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
         if (ret)
                 goto free;
 
-        printk(KERN_INFO "%s: ether1 in slot %d, ",
-                dev->name, ec->slot_no);
+        printk(KERN_INFO "%s: ether1 in slot %d, %s\n",
+                dev->name, ec->slot_no, print_mac(mac, dev->dev_addr));
     
-        for (i = 0; i < 6; i++)
-                printk ("%2.2x%c", dev->dev_addr[i], i == 5 ? '\n' : ':');
-
         ecard_set_drvdata(ec, dev);
         return 0;
 
diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c
index 4a914748c0e4..67e96ae85035 100644
--- a/drivers/net/arm/ether3.c
+++ b/drivers/net/arm/ether3.c
@@ -775,7 +775,8 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         const struct ether3_data *data = id->data;
         struct net_device *dev;
-        int i, bus_type, ret;
+        int bus_type, ret;
+        DECLARE_MAC_BUF(mac);
 
         ether3_banner();
 
@@ -858,9 +859,8 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
         if (ret)
                 goto free;
 
-        printk("%s: %s in slot %d, ", dev->name, data->name, ec->slot_no);
-        for (i = 0; i < 6; i++)
-                printk("%2.2x%c", dev->dev_addr[i], i == 5 ? '\n' : ':');
+        printk("%s: %s in slot %d, %s\n",
+               dev->name, data->name, ec->slot_no, print_mac(mac, dev->dev_addr));
 
         ecard_set_drvdata(ec, dev);
         return 0;
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c
index 5d093b3ddcd4..00081d2b9cd5 100644
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
@@ -648,6 +648,7 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
         struct net_device *dev;
         struct etherh_priv *eh;
         int i, ret;
+        DECLARE_MAC_BUF(mac);
 
         etherh_banner();
 
@@ -745,11 +746,8 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
         if (ret)
                 goto free;
 
-        printk(KERN_INFO "%s: %s in slot %d, ",
-                dev->name, data->name, ec->slot_no);
-
-        for (i = 0; i < 6; i++)
-                printk("%2.2x%c", dev->dev_addr[i], i == 5 ? '\n' : ':');
+        printk(KERN_INFO "%s: %s in slot %d, %s\n",
+                dev->name, data->name, ec->slot_no, print_mac(mac, dev->dev_addr));
 
         ecard_set_drvdata(ec, dev);
 
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index a124fdb2bce6..b032c1bf492f 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -265,6 +265,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
         unsigned int i, irq, is_fmv18x = 0, is_at1700 = 0;
         int slot, ret = -ENODEV;
         struct net_local *lp = netdev_priv(dev);
+        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, AT1700_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -388,16 +389,15 @@ found:
         if (is_at1700) {
                 for(i = 0; i < 3; i++) {
                         unsigned short eeprom_val = read_eeprom(ioaddr, 4+i);
-                        printk("%04x", eeprom_val);
                         ((unsigned short *)dev->dev_addr)[i] = ntohs(eeprom_val);
                 }
         } else {
                 for(i = 0; i < 6; i++) {
                         unsigned char val = inb(ioaddr + SAPROM + i);
-                        printk("%02x", val);
                         dev->dev_addr[i] = val;
                 }
         }
+        printk("%s", print_mac(mac, dev->dev_addr));
 
         /* The EEPROM word 12 bit 0x0400 means use regular 100 ohm 10baseT signals,
            rather than 150 ohm shielded twisted pair compensation.
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index 8bf548e1cb4e..ebf1a3a88e15 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -467,6 +467,7 @@ static unsigned long __init lance_probe1( struct net_device *dev,
         int                                     i;
         static int                              did_version;
         unsigned short                  save1, save2;
+        DECLARE_MAC_BUF(mac);
 
         PROBE_PRINT(( "Probing for Lance card at mem %#lx io %#lx\n",
                                   (long)memaddr, (long)ioaddr ));
@@ -595,8 +596,7 @@ static unsigned long __init lance_probe1( struct net_device *dev,
                 i = IO->mem;
                 break;
         }
-        for( i = 0; i < 6; ++i )
-                printk( "%02x%s", dev->dev_addr[i], (i < 5) ? ":" : "\n" );
+        printk("%s\n", print_mac(mac, dev->dev_addr));
         if (lp->cardtype == OLD_RIEBL) {
                 printk( "%s: Warning: This is a default ethernet address!\n",
                                 dev->name );
@@ -779,6 +779,8 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
         int entry, len;
         struct lance_tx_head *head;
         unsigned long flags;
+        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mac2);
 
         DPRINTK( 2, ( "%s: lance_start_xmit() called, csr0 %4.4x.\n",
                                   dev->name, DREG ));
@@ -801,17 +803,13 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
 
         /* Fill in a Tx ring entry */
         if (lance_debug >= 3) {
-                u_char *p;
-                int i;
-                printk( "%s: TX pkt type 0x%04x from ", dev->name,
-                                ((u_short *)skb->data)[6]);
-                for( p = &((u_char *)skb->data)[6], i = 0; i < 6; i++ )
-                        printk("%02x%s", *p++, i != 5 ? ":" : "" );
-                printk(" to ");
-                for( p = (u_char *)skb->data, i = 0; i < 6; i++ )
-                        printk("%02x%s", *p++, i != 5 ? ":" : "" );
-                printk(" data at 0x%08x len %d\n", (int)skb->data,
-                           (int)skb->len );
+                printk( "%s: TX pkt type 0x%04x from "
+                                "%s to %s"
+                                " data at 0x%08x len %d\n",
+                                dev->name, ((u_short *)skb->data)[6],
+                                print_mac(mac, &skb->data[6]),
+                                print_mac(mac2, skb->data),
+                                (int)skb->data, (int)skb->len );
         }
 
         /* We're not prepared for the int until the last flags are set/reset. And
@@ -1021,19 +1019,18 @@ static int lance_rx( struct net_device *dev )
                                 }
 
                                 if (lance_debug >= 3) {
-                                        u_char *data = PKTBUF_ADDR(head), *p;
-                                        printk( "%s: RX pkt type 0x%04x from ", dev->name,
-                                                        ((u_short *)data)[6]);
-                                        for( p = &data[6], i = 0; i < 6; i++ )
-                                                printk("%02x%s", *p++, i != 5 ? ":" : "" );
-                                        printk(" to ");
-                                        for( p = data, i = 0; i < 6; i++ )
-                                                printk("%02x%s", *p++, i != 5 ? ":" : "" );
-                                        printk(" data %02x %02x %02x %02x %02x %02x %02x %02x "
+                                        u_char *data = PKTBUF_ADDR(head);
+                                        DECLARE_MAC_BUF(mac);
+                                        DECLARE_MAC_BUF(mac2);
+
+                                        printk(KERN_DEBUG "%s: RX pkt type 0x%04x from %s to %s ",
+                                                   "data %02x %02x %02x %02x %02x %02x %02x %02x "
                                                    "len %d\n",
+                                                   dev->name, ((u_short *)data)[6],
+                                                   print_mac(mac, &data[6]), print_mac(mac2, data),
                                                    data[15], data[16], data[17], data[18],
                                                    data[19], data[20], data[21], data[22],
-                                                   pkt_len );
+                                                   pkt_len);
                                 }
 
                                 skb_reserve( skb, 2 );  /* 16 byte align */
diff --git a/drivers/net/atp.c b/drivers/net/atp.c
index cec2e3672cd0..62f09e59d9c4 100644
--- a/drivers/net/atp.c
+++ b/drivers/net/atp.c
@@ -248,6 +248,7 @@ static int __init atp_probe1(long ioaddr)
         struct net_local *lp;
         int saved_ctrl_reg, status, i;
         int res;
+        DECLARE_MAC_BUF(mac);
 
         outb(0xff, ioaddr + PAR_DATA);
         /* Save the original value of the Control register, in case we guessed
@@ -322,10 +323,9 @@ static int __init atp_probe1(long ioaddr)
                 printk(KERN_INFO "%s", version);
 #endif
 
-        printk(KERN_NOTICE "%s: Pocket adapter found at %#3lx, IRQ %d, SAPROM "
-                   "%02X:%02X:%02X:%02X:%02X:%02X.\n", dev->name, dev->base_addr,
-                   dev->irq, dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-                   dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+        printk(KERN_NOTICE "%s: Pocket adapter found at %#3lx, IRQ %d, "
+               "SAPROM %s.\n",
+               dev->name, dev->base_addr, dev->irq, print_mac(mac, dev->dev_addr));
 
         /* Reset the ethernet hardware and activate the printer pass-through. */
         write_reg_high(ioaddr, CMR1, CMR1h_RESET | CMR1h_MUX);
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 6d193705a3bc..40842a6aa994 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -2100,7 +2100,8 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
         unsigned long b44reg_base, b44reg_len;
         struct net_device *dev;
         struct b44 *bp;
-        int err, i;
+        int err;
+        DECLARE_MAC_BUF(mac);
 
         if (b44_version_printed++ == 0)
                 printk(KERN_INFO "%s", version);
@@ -2229,10 +2230,8 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
          */
         b44_chip_reset(bp);
 
-        printk(KERN_INFO "%s: Broadcom 4400 10/100BaseT Ethernet ", dev->name);
-        for (i = 0; i < 6; i++)
-                printk("%2.2x%c", dev->dev_addr[i],
-                       i == 5 ? '\n' : ':');
+        printk(KERN_INFO "%s: Broadcom 4400 10/100BaseT Ethernet %s\n",
+               dev->name, print_mac(mac, dev->dev_addr));
 
         return 0;
 
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 2761441f6644..a42bd19646d3 100644
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -1258,6 +1258,7 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
         unsigned char addr[6];
         struct net_device *dev;
         int is_bmac_plus = ((int)match->data) != 0;
+        DECLARE_MAC_BUF(mac);
 
         if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) {
                 printk(KERN_ERR "BMAC: can't use, need 3 addrs and 3 intrs\n");
@@ -1367,9 +1368,8 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
                 goto err_out_irq2;
         }
 
-        printk(KERN_INFO "%s: BMAC%s at", dev->name, (is_bmac_plus? "+": ""));
-        for (j = 0; j < 6; ++j)
-                printk("%c%.2x", (j? ':': ' '), dev->dev_addr[j]);
+        printk(KERN_INFO "%s: BMAC%s at %s",
+               dev->name, (is_bmac_plus ? "+" : ""), print_mac(mac, dev->dev_addr));
         XXDEBUG((", base_addr=%#0lx", dev->base_addr));
         printk("\n");
 
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 5ee805b3e0e6..ee9aed3aa489 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -6821,8 +6821,9 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         static int version_printed = 0;
         struct net_device *dev = NULL;
         struct bnx2 *bp;
-        int rc, i;
+        int rc;
         char str[40];
+        DECLARE_MAC_BUF(mac);
 
         if (version_printed++ == 0)
                 printk(KERN_INFO "%s", version);
@@ -6890,19 +6891,14 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         }
 
         printk(KERN_INFO "%s: %s (%c%d) %s found at mem %lx, "
-                "IRQ %d, ",
+                "IRQ %d, node addr %s\n",
                 dev->name,
                 bp->name,
                 ((CHIP_ID(bp) & 0xf000) >> 12) + 'A',
                 ((CHIP_ID(bp) & 0x0ff0) >> 4),
                 bnx2_bus_string(bp, str),
                 dev->base_addr,
-                bp->pdev->irq);
-
-        printk("node addr ");
-        for (i = 0; i < 6; i++)
-                printk("%2.2x", dev->dev_addr[i]);
-        printk("\n");
+                bp->pdev->irq, print_mac(mac, dev->dev_addr));
 
         return 0;
 }
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index ea58144c220e..8f77db2112ce 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1604,6 +1604,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
         struct slave *slave, *oldcurrent;
         struct sockaddr addr;
         int mac_addr_differ;
+        DECLARE_MAC_BUF(mac);
 
         /* slave is not a slave or master is not master of this slave */
         if (!(slave_dev->flags & IFF_SLAVE) ||
@@ -1631,19 +1632,13 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                                  ETH_ALEN);
         if (!mac_addr_differ && (bond->slave_cnt > 1)) {
                 printk(KERN_WARNING DRV_NAME
-                       ": %s: Warning: the permanent HWaddr of %s "
-                       "- %02X:%02X:%02X:%02X:%02X:%02X - is "
-                       "still in use by %s. Set the HWaddr of "
-                       "%s to a different address to avoid "
-                       "conflicts.\n",
+                       ": %s: Warning: the permanent HWaddr of %s - "
+                       "%s - is still in use by %s. "
+                       "Set the HWaddr of %s to a different address "
+                       "to avoid conflicts.\n",
                        bond_dev->name,
                        slave_dev->name,
-                       slave->perm_hwaddr[0],
-                       slave->perm_hwaddr[1],
-                       slave->perm_hwaddr[2],
-                       slave->perm_hwaddr[3],
-                       slave->perm_hwaddr[4],
-                       slave->perm_hwaddr[5],
+                       print_mac(mac, slave->perm_hwaddr),
                        bond_dev->name,
                        slave_dev->name);
         }
@@ -3006,6 +3001,7 @@ static void bond_info_show_master(struct seq_file *seq)
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 struct ad_info ad_info;
+                DECLARE_MAC_BUF(mac);
 
                 seq_puts(seq, "\n802.3ad info\n");
                 seq_printf(seq, "LACP rate: %s\n",
@@ -3025,13 +3021,8 @@ static void bond_info_show_master(struct seq_file *seq)
                                    ad_info.actor_key);
                         seq_printf(seq, "\tPartner Key: %d\n",
                                    ad_info.partner_key);
-                        seq_printf(seq, "\tPartner Mac Address: %02x:%02x:%02x:%02x:%02x:%02x\n",
-                                   ad_info.partner_system[0],
-                                   ad_info.partner_system[1],
-                                   ad_info.partner_system[2],
-                                   ad_info.partner_system[3],
-                                   ad_info.partner_system[4],
-                                   ad_info.partner_system[5]);
+                        seq_printf(seq, "\tPartner Mac Address: %s\n",
+                                   print_mac(mac, ad_info.partner_system));
                 }
         }
 }
@@ -3039,6 +3030,7 @@ static void bond_info_show_master(struct seq_file *seq)
 static void bond_info_show_slave(struct seq_file *seq, const struct slave *slave)
 {
         struct bonding *bond = seq->private;
+        DECLARE_MAC_BUF(mac);
 
         seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);
         seq_printf(seq, "MII Status: %s\n",
@@ -3047,10 +3039,8 @@ static void bond_info_show_slave(struct seq_file *seq, const struct slave *slave
                    slave->link_failure_count);
 
         seq_printf(seq,
-                   "Permanent HW addr: %02x:%02x:%02x:%02x:%02x:%02x\n",
-                   slave->perm_hwaddr[0], slave->perm_hwaddr[1],
-                   slave->perm_hwaddr[2], slave->perm_hwaddr[3],
-                   slave->perm_hwaddr[4], slave->perm_hwaddr[5]);
+                   "Permanent HW addr: %s\n",
+                   print_mac(mac, slave->perm_hwaddr));
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 const struct aggregator *agg
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index a771853219da..f10927639b5c 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -1361,17 +1361,14 @@ static ssize_t bonding_show_ad_partner_mac(struct device *d,
 {
         int count = 0;
         struct bonding *bond = to_bond(d);
+        DECLARE_MAC_BUF(mac);
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 struct ad_info ad_info;
                 if (!bond_3ad_get_active_agg_info(bond, &ad_info)) {
-                        count = sprintf(buf,"%02x:%02x:%02x:%02x:%02x:%02x\n",
-                                       ad_info.partner_system[0],
-                                       ad_info.partner_system[1],
-                                       ad_info.partner_system[2],
-                                       ad_info.partner_system[3],
-                                       ad_info.partner_system[4],
-                                       ad_info.partner_system[5]) + 1;
+                        count = sprintf(buf,"%s\n",
+                                        print_mac(mac, ad_info.partner_system))
+                                + 1;
                 }
         }
         else
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index f44f3d2a4b4e..adc2e4d5a69e 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -4877,6 +4877,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
         int i, err, pci_using_dac;
         u16 pci_cmd;
         u8 orig_cacheline_size = 0, cas_cacheline_size = 0;
+        DECLARE_MAC_BUF(mac);
 
         if (cas_version_printed++ == 0)
                 printk(KERN_INFO "%s", version);
@@ -5084,16 +5085,12 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
 
         i = readl(cp->regs + REG_BIM_CFG);
         printk(KERN_INFO "%s: Sun Cassini%s (%sbit/%sMHz PCI/%s) "
-               "Ethernet[%d] ",  dev->name,
+               "Ethernet[%d] %s\n",  dev->name,
                (cp->cas_flags & CAS_FLAG_REG_PLUS) ? "+" : "",
                (i & BIM_CFG_32BIT) ? "32" : "64",
                (i & BIM_CFG_66MHZ) ? "66" : "33",
-               (cp->phy_type == CAS_PHY_SERDES) ? "Fi" : "Cu", pdev->irq);
-
-        for (i = 0; i < 6; i++)
-                printk("%2.2x%c", dev->dev_addr[i],
-                       i == 5 ? ' ' : ':');
-        printk("\n");
+               (cp->phy_type == CAS_PHY_SERDES) ? "Fi" : "Cu", pdev->irq,
+               print_mac(mac, dev->dev_addr));
 
         pci_set_drvdata(pdev, dev);
         cp->hw_running = 1;
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index 5bdf5ca85a65..314b2f68f78f 100644
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -618,12 +618,8 @@ e100_set_mac_address(struct net_device *dev, void *p)
 
         /* show it in the log as well */
 
-        printk(KERN_INFO "%s: changed MAC to ", dev->name);
-
-        for (i = 0; i < 5; i++)
-                printk("%02X:", dev->dev_addr[i]);
-
-        printk("%02X\n", dev->dev_addr[i]);
+        printk(KERN_INFO "%s: changed MAC to %s\n",
+               dev->name, print_mac(mac, dev->dev_addr));
 
         spin_unlock(&np->lock);
 
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 4cf82cf5ac10..571750975137 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -516,6 +516,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
         unsigned rev_type = 0;
         int eeprom_buff[CHKSUM_LEN];
         int retval;
+        DECLARE_MAC_BUF(mac);
 
         /* Initialize the device structure. */
         if (!modular) {
@@ -840,11 +841,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
         }
 
         /* print the ethernet address. */
-        printk(", MAC");
-        for (i = 0; i < ETH_ALEN; i++)
-        {
-                printk("%c%02x", i ? ':' : ' ', dev->dev_addr[i]);
-        }
+        printk(", MAC %s", print_mac(mac, dev->dev_addr));
 
         dev->open               = net_open;
         dev->stop               = net_close;
@@ -1806,17 +1803,15 @@ static int set_mac_address(struct net_device *dev, void *p)
         int i;
         struct sockaddr *addr = p;
 
-
         if (netif_running(dev))
                 return -EBUSY;
 
         memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
 
         if (net_debug) {
-                printk("%s: Setting MAC address to ", dev->name);
-                for (i = 0; i < dev->addr_len; i++)
-                        printk(" %2.2x", dev->dev_addr[i]);
-                printk(".\n");
+                DECLARE_MAC_BUF(mac);
+                printk("%s: Setting MAC address to %s.\n",
+                       dev->name, print_mac(mac, dev->dev_addr));
         }
         /* set the Ethernet address */
         for (i=0; i < ETH_ALEN/2; i++)
diff --git a/drivers/net/de600.c b/drivers/net/de600.c
index 421c2ca49711..cb849b091f98 100644
--- a/drivers/net/de600.c
+++ b/drivers/net/de600.c
@@ -384,6 +384,7 @@ static struct net_device * __init de600_probe(void)
         int     i;
         struct net_device *dev;
         int err;
+        DECLARE_MAC_BUF(mac);
 
         dev = alloc_etherdev(0);
         if (!dev)
@@ -438,10 +439,7 @@ static struct net_device * __init de600_probe(void)
                 goto out1;
         }
 
-        printk(", Ethernet Address: %02X", dev->dev_addr[0]);
-        for (i = 1; i < ETH_ALEN; i++)
-                printk(":%02X",dev->dev_addr[i]);
-        printk("\n");
+        printk(", Ethernet Address: %s\n", print_mac(mac, dev->dev_addr));
 
         dev->open = de600_open;
         dev->stop = de600_close;
diff --git a/drivers/net/de620.c b/drivers/net/de620.c
index 4b93902906ba..3f5190c654cf 100644
--- a/drivers/net/de620.c
+++ b/drivers/net/de620.c
@@ -807,6 +807,7 @@ struct net_device * __init de620_probe(int unit)
         struct net_device *dev;
         int err = -ENOMEM;
         int i;
+        DECLARE_MAC_BUF(mac);
 
         dev = alloc_etherdev(0);
         if (!dev)
@@ -853,13 +854,14 @@ struct net_device * __init de620_probe(int unit)
         }
 
         /* else, got it! */
-        printk(", Ethernet Address: %2.2X",
-                dev->dev_addr[0] = nic_data.NodeID[0]);
+        dev->dev_addr[0] = nic_data.NodeID[0];
         for (i = 1; i < ETH_ALEN; i++) {
-                printk(":%2.2X", dev->dev_addr[i] = nic_data.NodeID[i]);
+                dev->dev_addr[i] = nic_data.NodeID[i];
                 dev->broadcast[i] = 0xff;
         }
 
+        printk(", Ethernet Address: %s", print_mac(mac, dev->dev_addr));
+
         printk(" (%dk RAM,",
                 (nic_data.RAM_Size) ? (nic_data.RAM_Size >> 2) : 64);
 
diff --git a/drivers/net/declance.c b/drivers/net/declance.c
index 7e7ac3330e60..00e0194bfef0 100644
--- a/drivers/net/declance.c
+++ b/drivers/net/declance.c
@@ -1027,6 +1027,7 @@ static int __init dec_lance_probe(struct device *bdev, const int type)
         int i, ret;
         unsigned long esar_base;
         unsigned char *esar;
+        DECLARE_MAC_BUF(mac);
 
         if (dec_lance_debug && version_printed++ == 0)
                 printk(version);
@@ -1214,21 +1215,20 @@ static int __init dec_lance_probe(struct device *bdev, const int type)
          */
         switch (type) {
         case ASIC_LANCE:
-                printk("%s: IOASIC onboard LANCE, addr = ", name);
+                printk("%s: IOASIC onboard LANCE", name);
                 break;
         case PMAD_LANCE:
-                printk("%s: PMAD-AA, addr = ", name);
+                printk("%s: PMAD-AA", name);
                 break;
         case PMAX_LANCE:
-                printk("%s: PMAX onboard LANCE, addr = ", name);
+                printk("%s: PMAX onboard LANCE", name);
                 break;
         }
-        for (i = 0; i < 6; i++) {
+        for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = esar[i * 4];
-                printk("%2.2x%c", dev->dev_addr[i], i == 5 ? ',' : ':');
-        }
 
-        printk(" irq = %d\n", dev->irq);
+        printk(", addr = %s, irq = %d\n",
+               print_mac(mac, dev->dev_addr), dev->irq);
 
         dev->open = &lance_open;
         dev->stop = &lance_close;
diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index 28fa2bdc8c79..ace39ec0a367 100644
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -573,6 +573,7 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device)
         s16 nicsr;
         u_long ioaddr;
         u_long mem_start;
+        DECLARE_MAC_BUF(mac);
 
         /*
          * We are now supposed to enter this function with the
@@ -632,14 +633,11 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device)
 
         printk(", h/w address ");
         status = get_hw_addr(dev);
+        printk("%s", print_mac(mac, dev->dev_addr));
         if (status != 0) {
                 printk("      which has an Ethernet PROM CRC error.\n");
                 return -ENXIO;
         }
-        for (i = 0; i < ETH_ALEN - 1; i++) {    /* get the ethernet address */
-                printk("%2.2x:", dev->dev_addr[i]);
-        }
-        printk("%2.2x", dev->dev_addr[i]);
 
         /* Set up the maximum amount of network RAM(kB) */
         netRAM = ((lp->adapter != DEPCA) ? 64 : 48);
@@ -1843,6 +1841,7 @@ static void depca_dbg_open(struct net_device *dev)
         u_long ioaddr = dev->base_addr;
         struct depca_init *p = &lp->init_block;
         int i;
+        DECLARE_MAC_BUF(mac);
 
         if (depca_debug > 1) {
                 /* Do not copy the shadow init block into shared memory */
@@ -1881,11 +1880,7 @@ static void depca_dbg_open(struct net_device *dev)
                 printk("...0x%8.8x\n", readl(&lp->tx_ring[i].base));
                 printk("Initialisation block at 0x%8.8lx(Phys)\n", lp->mem_start);
                 printk("        mode: 0x%4.4x\n", p->mode);
-                printk("        physical address: ");
-                for (i = 0; i < ETH_ALEN - 1; i++) {
-                        printk("%2.2x:", p->phys_addr[i]);
-                }
-                printk("%2.2x\n", p->phys_addr[i]);
+                printk("        physical address: %s\n", print_mac(mac, p->phys_addr));
                 printk("        multicast hash table: ");
                 for (i = 0; i < (HASH_TABLE_LEN >> 3) - 1; i++) {
                         printk("%2.2x:", p->mcast_table[i]);
diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c
index a9ef79da3dc7..054f2ba5f698 100644
--- a/drivers/net/dgrs.c
+++ b/drivers/net/dgrs.c
@@ -1139,6 +1139,7 @@ dgrs_probe1(struct net_device *dev)
         DGRS_PRIV       *priv = (DGRS_PRIV *) dev->priv;
         unsigned long   i;
         int             rc;
+        DECLARE_MAC_BUF(mac);
 
         printk("%s: Digi RightSwitch io=%lx mem=%lx irq=%d plx=%lx dma=%lx\n",
                 dev->name, dev->base_addr, dev->mem_start, dev->irq,
@@ -1154,11 +1155,9 @@ dgrs_probe1(struct net_device *dev)
         /*
          * Get ether address of board
          */
-        printk("%s: Ethernet address", dev->name);
         memcpy(dev->dev_addr, priv->port->ethaddr, 6);
-        for (i = 0; i < 6; ++i)
-                printk("%c%2.2x", i ? ':' : ' ', dev->dev_addr[i]);
-        printk("\n");
+        printk("%s: Ethernet address %s\n",
+               dev->name, print_mac(mac, dev->dev_addr));
 
         if (dev->dev_addr[0] & 1)
         {
@@ -1214,15 +1213,12 @@ static int __init
 dgrs_initclone(struct net_device *dev)
 {
         DGRS_PRIV       *priv = (DGRS_PRIV *) dev->priv;
-        int             i;
+        DECLARE_MAC_BUF(mac);
 
-        printk("%s: Digi RightSwitch port %d ",
-                dev->name, priv->chan);
-        for (i = 0; i < 6; ++i)
-                printk("%c%2.2x", i ? ':' : ' ', dev->dev_addr[i]);
-        printk("\n");
+        printk("%s: Digi RightSwitch port %d %s\n",
+                dev->name, priv->chan, print_mac(mac, dev->dev_addr));
 
-        return (0);
+        return 0;
 }
 
 static struct net_device * __init
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index 12486e13b85b..e91b7096838a 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -97,6 +97,7 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
         static int version_printed;
         void *ring_space;
         dma_addr_t ring_dma;
+        DECLARE_MAC_BUF(mac);
 
         if (!version_printed++)
                 printk ("%s", version);
@@ -256,10 +257,8 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
 
         card_idx++;
 
-        printk (KERN_INFO "%s: %s, %02x:%02x:%02x:%02x:%02x:%02x, IRQ %d\n",
-                dev->name, np->name,
-                dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-                dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5], irq);
+        printk (KERN_INFO "%s: %s, %s, IRQ %d\n",
+                dev->name, np->name, print_mac(mac, dev->dev_addr), irq);
         if (tx_coalesce > 1)
                 printk(KERN_INFO "tx_coalesce:\t%d packets\n",
                                 tx_coalesce);
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index f691ef61b2d3..27ac010900ab 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -595,11 +595,10 @@ dm9000_probe(struct platform_device *pdev)
         ret = register_netdev(ndev);
 
         if (ret == 0) {
-                printk("%s: dm9000 at %p,%p IRQ %d MAC: ",
-                       ndev->name,  db->io_addr, db->io_data, ndev->irq);
-                for (i = 0; i < 5; i++)
-                        printk("%02x:", ndev->dev_addr[i]);
-                printk("%02x\n", ndev->dev_addr[5]);
+                DECLARE_MAC_BUF(mac);
+                printk("%s: dm9000 at %p,%p IRQ %d MAC: %s\n",
+                       ndev->name,  db->io_addr, db->io_data, ndev->irq,
+                       print_mac(mac, ndev->dev_addr));
         }
         return 0;
 
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 99126564f1a0..720994b1e13a 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2548,6 +2548,7 @@ static int __devinit e100_probe(struct pci_dev *pdev,
         struct net_device *netdev;
         struct nic *nic;
         int err;
+        DECLARE_MAC_BUF(mac);
 
         if(!(netdev = alloc_etherdev(sizeof(struct nic)))) {
                 if(((1 << debug) - 1) & NETIF_MSG_PROBE)
@@ -2679,11 +2680,9 @@ static int __devinit e100_probe(struct pci_dev *pdev,
                 goto err_out_free;
         }
 
-        DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, "
-                "MAC addr %02X:%02X:%02X:%02X:%02X:%02X\n",
-                (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0), pdev->irq,
-                netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2],
-                netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]);
+        DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %s\n",
+                (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0),
+                pdev->irq, print_mac(mac, netdev->dev_addr));
 
         return 0;
 
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 7befb706ad55..ad444c9a5d04 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -872,6 +872,8 @@ e1000_probe(struct pci_dev *pdev,
         int i, err, pci_using_dac;
         uint16_t eeprom_data = 0;
         uint16_t eeprom_apme_mask = E1000_EEPROM_APME;
+        DECLARE_MAC_BUF(mac);
+
         if ((err = pci_enable_device(pdev)))
                 return err;
 
@@ -1132,8 +1134,7 @@ e1000_probe(struct pci_dev *pdev,
                  "32-bit"));
         }
 
-        for (i = 0; i < 6; i++)
-                printk("%2.2x%c", netdev->dev_addr[i], i == 5 ? '\n' : ':');
+        printk("%s\n", print_mac(mac, netdev->dev_addr));
 
         /* reset the hardware with the new settings */
         e1000_reset(adapter);
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 54811f6f766d..83bda6ccde98 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -690,6 +690,7 @@ static void __init eepro_print_info (struct net_device *dev)
         struct eepro_local *    lp = netdev_priv(dev);
         int                     i;
         const char *            ifmap[] = {"AUI", "10Base2", "10BaseT"};
+        DECLARE_MAC_BUF(mac);
 
         i = inb(dev->base_addr + ID_REG);
         printk(KERN_DEBUG " id: %#x ",i);
@@ -711,10 +712,10 @@ static void __init eepro_print_info (struct net_device *dev)
                 case LAN595:
                         printk("%s: Intel 82595-based lan card at %#x,",
                                         dev->name, (unsigned)dev->base_addr);
+                        break;
         }
 
-        for (i=0; i < 6; i++)
-                printk("%c%02x", i ? ':' : ' ', dev->dev_addr[i]);
+        printk(" %s", print_mac(mac, dev->dev_addr));
 
         if (net_debug > 3)
                 printk(KERN_DEBUG ", %dK RCV buffer",
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index f8b69ceb2be6..1548a80f917d 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -622,6 +622,7 @@ static int __devinit speedo_found1(struct pci_dev *pdev,
         int size;
         void *tx_ring_space;
         dma_addr_t tx_ring_dma;
+        DECLARE_MAC_BUF(mac);
 
         size = TX_RING_SIZE * sizeof(struct TxFD) + sizeof(struct speedo_stats);
         tx_ring_space = pci_alloc_consistent(pdev, size, &tx_ring_dma);
@@ -705,12 +706,8 @@ static int __devinit speedo_found1(struct pci_dev *pdev,
         else
                 product = pci_name(pdev);
 
-        printk(KERN_INFO "%s: %s, ", dev->name, product);
-
-        for (i = 0; i < 5; i++)
-                printk("%2.2X:", dev->dev_addr[i]);
-        printk("%2.2X, ", dev->dev_addr[i]);
-        printk("IRQ %d.\n", pdev->irq);
+        printk(KERN_INFO "%s: %s, %s, IRQ %d.\n", dev->name, product,
+                   print_mac(mac, dev->dev_addr), pdev->irq);
 
         sp = netdev_priv(dev);
 
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index 5ac56f20003d..ecdd3fc8d70c 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -317,6 +317,7 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
         int i, ret, option = 0, duplex = 0;
         void *ring_space;
         dma_addr_t ring_dma;
+        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -493,11 +494,9 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
         if (ret < 0)
                 goto err_out_unmap_rx;
 
-        printk(KERN_INFO "%s: %s at %#lx, IRQ %d, ",
-                   dev->name, pci_id_tbl[chip_idx].name, ioaddr, dev->irq);
-        for (i = 0; i < 5; i++)
-                printk("%2.2x:", dev->dev_addr[i]);
-        printk("%2.2x.\n", dev->dev_addr[i]);
+        printk(KERN_INFO "%s: %s at %#lx, IRQ %d, %s\n",
+               dev->name, pci_id_tbl[chip_idx].name, ioaddr, dev->irq,
+               print_mac(mac, dev->dev_addr));
 
 out:
         return ret;
diff --git a/drivers/net/es3210.c b/drivers/net/es3210.c
index 238fa8aff02d..deefa51b8c31 100644
--- a/drivers/net/es3210.c
+++ b/drivers/net/es3210.c
@@ -179,6 +179,7 @@ static int __init es_probe1(struct net_device *dev, int ioaddr)
 {
         int i, retval;
         unsigned long eisa_id;
+        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr + ES_SA_PROM, ES_IO_EXTENT, "es3210"))
                 return -ENODEV;
@@ -190,7 +191,6 @@ static int __init es_probe1(struct net_device *dev, int ioaddr)
                 inb(ioaddr + ES_CFG4), inb(ioaddr + ES_CFG5), inb(ioaddr + ES_CFG6));
 #endif
 
-
 /*      Check the EISA ID of the card. */
         eisa_id = inl(ioaddr + ES_ID_PORT);
         if ((eisa_id != ES_EISA_ID1) && (eisa_id != ES_EISA_ID2)) {
@@ -198,21 +198,21 @@ static int __init es_probe1(struct net_device *dev, int ioaddr)
                 goto out;
         }
 
+        for (i = 0; i < ETHER_ADDR_LEN ; i++)
+                dev->dev_addr[i] = inb(ioaddr + ES_SA_PROM + i);
+
 /*      Check the Racal vendor ID as well. */
-        if (inb(ioaddr + ES_SA_PROM + 0) != ES_ADDR0
-                || inb(ioaddr + ES_SA_PROM + 1) != ES_ADDR1
-                || inb(ioaddr + ES_SA_PROM + 2) != ES_ADDR2 ) {
-                printk("es3210.c: card not found");
-                for(i = 0; i < ETHER_ADDR_LEN; i++)
-                        printk(" %02x", inb(ioaddr + ES_SA_PROM + i));
-                printk(" (invalid prefix).\n");
+        if (dev->dev_addr[0] != ES_ADDR0 ||
+            dev->dev_addr[1] != ES_ADDR1 ||
+            dev->dev_addr[2] != ES_ADDR2) {
+                printk("es3210.c: card not found %s (invalid_prefix).\n",
+                       print_mac(mac, dev->dev_addr));
                 retval = -ENODEV;
                 goto out;
         }
 
-        printk("es3210.c: ES3210 rev. %ld at %#x, node", eisa_id>>24, ioaddr);
-        for(i = 0; i < ETHER_ADDR_LEN; i++)
-                printk(" %02x", (dev->dev_addr[i] = inb(ioaddr + ES_SA_PROM + i)));
+        printk("es3210.c: ES3210 rev. %ld at %#x, node %s",
+               eisa_id>>24, ioaddr, print_mac(mac, dev->dev_addr));
 
         /* Snarf the interrupt now. */
         if (dev->irq == 0) {
diff --git a/drivers/net/ewrk3.c b/drivers/net/ewrk3.c
index 142aa225d89e..593a120e31b2 100644
--- a/drivers/net/ewrk3.c
+++ b/drivers/net/ewrk3.c
@@ -396,6 +396,7 @@ ewrk3_hw_init(struct net_device *dev, u_long iobase)
         u_long mem_start, shmem_length;
         u_char cr, cmr, icr, nicsr, lemac, hard_strapped = 0;
         u_char eeprom_image[EEPROM_MAX], chksum, eisa_cr = 0;
+        DECLARE_MAC_BUF(mac);
 
         /*
         ** Stop the EWRK3. Enable the DBR ROM. Disable interrupts and remote boot.
@@ -460,10 +461,7 @@ ewrk3_hw_init(struct net_device *dev, u_long iobase)
         if (lemac != LeMAC2)
                 DevicePresent(iobase);  /* need after EWRK3_INIT */
         status = get_hw_addr(dev, eeprom_image, lemac);
-        for (i = 0; i < ETH_ALEN - 1; i++) {    /* get the ethernet addr. */
-                printk("%2.2x:", dev->dev_addr[i]);
-        }
-        printk("%2.2x,\n", dev->dev_addr[i]);
+        printk("%s\n", print_mac(mac, dev->dev_addr));
 
         if (status) {
                 printk("      which has an EEPROM CRC error.\n");
@@ -628,7 +626,7 @@ static int ewrk3_open(struct net_device *dev)
 {
         struct ewrk3_private *lp = netdev_priv(dev);
         u_long iobase = dev->base_addr;
-        int i, status = 0;
+        int status = 0;
         u_char icr, csr;
 
         /*
@@ -648,12 +646,10 @@ static int ewrk3_open(struct net_device *dev)
                         ewrk3_init(dev);
 
                         if (ewrk3_debug > 1) {
+                                DECLARE_MAC_BUF(mac);
                                 printk("%s: ewrk3 open with irq %d\n", dev->name, dev->irq);
-                                printk("  physical address: ");
-                                for (i = 0; i < 5; i++) {
-                                        printk("%2.2x:", (u_char) dev->dev_addr[i]);
-                                }
-                                printk("%2.2x\n", (u_char) dev->dev_addr[i]);
+                                printk("  physical address: %s\n",
+                                       print_mac(mac, dev->dev_addr));
                                 if (lp->shmem_length == 0) {
                                         printk("  no shared memory, I/O only mode\n");
                                 } else {
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index 402b071d8d53..43f7647ff246 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -486,6 +486,7 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev,
 #else
         int bar = 1;
 #endif
+        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -664,11 +665,9 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev,
         if (err)
                 goto err_out_free_tx;
 
-        printk(KERN_INFO "%s: %s at %p, ",
-               dev->name, skel_netdrv_tbl[chip_id].chip_name, ioaddr);
-        for (i = 0; i < 5; i++)
-                printk("%2.2x:", dev->dev_addr[i]);
-        printk("%2.2x, IRQ %d.\n", dev->dev_addr[i], irq);
+        printk(KERN_INFO "%s: %s at %p, %s, IRQ %d.\n",
+               dev->name, skel_netdrv_tbl[chip_id].chip_name, ioaddr,
+               print_mac(mac, dev->dev_addr), irq);
 
         return 0;
 
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 4419c3cee995..2b5782056dda 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -2635,6 +2635,7 @@ static int __init fec_enet_module_init(void)
 {
         struct net_device *dev;
         int i, j, err;
+        DECLARE_MAC_BUF(mac);
 
         printk("FEC ENET Version 0.2\n");
 
@@ -2653,10 +2654,8 @@ static int __init fec_enet_module_init(void)
                         return -EIO;
                 }
 
-                printk("%s: ethernet ", dev->name);
-                for (j = 0; (j < 5); j++)
-                        printk("%02x:", dev->dev_addr[j]);
-                printk("%02x\n", dev->dev_addr[5]);
+                printk("%s: ethernet %s\n",
+                       dev->name, print_mac(mac, dev->dev_addr));
         }
         return 0;
 }
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index be744573b1c2..f7354bc9b009 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -4991,6 +4991,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
         u32 powerstate, txreg;
         u32 phystate_orig = 0, phystate;
         int phyinitialized = 0;
+        DECLARE_MAC_BUF(mac);
 
         dev = alloc_etherdev(sizeof(struct fe_priv));
         err = -ENOMEM;
@@ -5205,10 +5206,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                  * Bad mac address. At least one bios sets the mac address
                  * to 01:23:45:67:89:ab
                  */
-                printk(KERN_ERR "%s: Invalid Mac address detected: %02x:%02x:%02x:%02x:%02x:%02x\n",
-                        pci_name(pci_dev),
-                        dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-                        dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+                printk(KERN_ERR "%s: Invalid Mac address detected: %s\n",
+                       pci_name(pci_dev), print_mac(mac, dev->dev_addr));
                 printk(KERN_ERR "Please complain to your hardware vendor. Switching to a random MAC.\n");
                 dev->dev_addr[0] = 0x00;
                 dev->dev_addr[1] = 0x00;
@@ -5216,9 +5215,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                 get_random_bytes(&dev->dev_addr[3], 3);
         }
 
-        dprintk(KERN_DEBUG "%s: MAC Address %02x:%02x:%02x:%02x:%02x:%02x\n", pci_name(pci_dev),
-                        dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-                        dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+        dprintk(KERN_DEBUG "%s: MAC Address %s\n",
+                pci_name(pci_dev), print_mac(mac, dev->dev_addr));
 
         /* set mac address */
         nv_copy_mac_to_hw(dev);
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 5a1a1165b48c..0db5e6fabe73 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -170,6 +170,7 @@ static int gfar_probe(struct platform_device *pdev)
         struct resource *r;
         int idx;
         int err = 0;
+        DECLARE_MAC_BUF(mac);
 
         einfo = (struct gianfar_platform_data *) pdev->dev.platform_data;
 
@@ -356,10 +357,8 @@ static int gfar_probe(struct platform_device *pdev)
         gfar_init_sysfs(dev);
 
         /* Print out the device info */
-        printk(KERN_INFO DEVICE_NAME, dev->name);
-        for (idx = 0; idx < 6; idx++)
-                printk("%2.2x%c", dev->dev_addr[idx], idx == 5 ? ' ' : ':');
-        printk("\n");
+        printk(KERN_INFO DEVICE_NAME "%s\n",
+               dev->name, print_mac(mac, dev->dev_addr));
 
         /* Even more device info helps when determining which kernel */
         /* provided which set of benchmarks. */
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index da12b3db023f..015ed3a4057f 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -580,6 +580,7 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev,
         void *ring_space;
         dma_addr_t ring_dma;
         int ret = -ENOMEM;
+        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -741,12 +742,9 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev,
                 goto err_out_unmap_rx;
         }
 
-        printk(KERN_INFO "%s: %s type %x at %p, ",
+        printk(KERN_INFO "%s: %s type %x at %p, %s, IRQ %d.\n",
                    dev->name, chip_tbl[chip_id].name, readl(ioaddr + ChipRev),
-                   ioaddr);
-        for (i = 0; i < 5; i++)
-                        printk("%2.2x:", dev->dev_addr[i]);
-        printk("%2.2x, IRQ %d.\n", dev->dev_addr[i], irq);
+                   ioaddr, print_mac(mac, dev->dev_addr), irq);
         i = readb(ioaddr + PCIClkMeas);
         printk(KERN_INFO "%s:  %d-bit %d Mhz PCI bus (%d), Virtual Jumpers "
                    "%2.2x, LPA %4.4x.\n",
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index df09210f7351..c05bc37df356 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -64,7 +64,7 @@
 #include <net/ax25.h>
 #include <linux/inet.h>
 #include <linux/netdevice.h>
-#include <linux/if_ether.h>
+#include <linux/etherdevice.h>
 #include <linux/if_arp.h>
 #include <linux/skbuff.h>
 #include <net/sock.h>
@@ -95,7 +95,6 @@ static char bpq_eth_addr[6];
 
 static int bpq_rcv(struct sk_buff *, struct net_device *, struct packet_type *, struct net_device *);
 static int bpq_device_event(struct notifier_block *, unsigned long, void *);
-static const char *bpq_print_ethaddr(const unsigned char *);
 
 static struct packet_type bpq_packet_type = {
         .type   = __constant_htons(ETH_P_BPQ),
@@ -383,16 +382,6 @@ static int bpq_close(struct net_device *dev)
 /*
  *      Proc filesystem
  */
-static const char * bpq_print_ethaddr(const unsigned char *e)
-{
-        static char buf[18];
-
-        sprintf(buf, "%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X",
-                e[0], e[1], e[2], e[3], e[4], e[5]);
-
-        return buf;
-}
-
 static void *bpq_seq_start(struct seq_file *seq, loff_t *pos)
 {
         int i = 1;
@@ -438,14 +427,16 @@ static int bpq_seq_show(struct seq_file *seq, void *v)
                          "dev   ether      destination        accept from\n");
         else {
                 const struct bpqdev *bpqdev = v;
+                DECLARE_MAC_BUF(mac);
 
                 seq_printf(seq, "%-5s %-10s %s  ",
                         bpqdev->axdev->name, bpqdev->ethdev->name,
-                        bpq_print_ethaddr(bpqdev->dest_addr));
+                        print_mac(mac, bpqdev->dest_addr));
 
-                seq_printf(seq, "%s\n",
-                        (bpqdev->acpt_addr[0] & 0x01) ? "*" 
-                           : bpq_print_ethaddr(bpqdev->acpt_addr));
+                if (is_multicast_ether_addr(bpqdev->acpt_addr))
+                        seq_printf(seq, "*\n");
+                else
+                        seq_printf(seq, "%s\n", print_mac(mac, bpqdev->acpt_addr));
 
         }
         return 0;
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c
index 8d4f810fa288..c2c4f49d7578 100644
--- a/drivers/net/hp-plus.c
+++ b/drivers/net/hp-plus.c
@@ -166,6 +166,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
         const char name[] = "HP-PC-LAN+";
         int mem_start;
         static unsigned version_printed;
+        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, HP_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -180,7 +181,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
         if (ei_debug  &&  version_printed++ == 0)
                 printk(version);
 
-        printk("%s: %s at %#3x,", dev->name, name, ioaddr);
+        printk("%s: %s at %#3x, ", dev->name, name, ioaddr);
 
         /* Retrieve and checksum the station address. */
         outw(MAC_Page, ioaddr + HP_PAGING);
@@ -189,10 +190,11 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
                 unsigned char inval = inb(ioaddr + 8 + i);
                 dev->dev_addr[i] = inval;
                 checksum += inval;
-                printk(" %2.2x", inval);
         }
         checksum += inb(ioaddr + 14);
 
+        printk("%s", print_mac(mac, dev->dev_addr));
+
         if (checksum != 0xff) {
                 printk(" bad checksum %2.2x.\n", checksum);
                 retval = -ENODEV;
diff --git a/drivers/net/hp.c b/drivers/net/hp.c
index 1f11126de354..c649a8019beb 100644
--- a/drivers/net/hp.c
+++ b/drivers/net/hp.c
@@ -127,6 +127,7 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)
         int i, retval, board_id, wordmode;
         const char *name;
         static unsigned version_printed;
+        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, HP_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -158,7 +159,9 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)
         printk("%s: %s (ID %02x) at %#3x,", dev->name, name, board_id, ioaddr);
 
         for(i = 0; i < ETHER_ADDR_LEN; i++)
-                printk(" %2.2x", dev->dev_addr[i] = inb(ioaddr + i));
+                dev->dev_addr[i] = inb(ioaddr + i);
+
+        printk(" %s", print_mac(mac, dev->dev_addr));
 
         /* Snarf the interrupt now.  Someday this could be moved to open(). */
         if (dev->irq < 2) {
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index 406d6525e222..e4fde17e2841 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -2093,9 +2093,9 @@ static void hp100_set_multicast_list(struct net_device *dev)
                                 addrs = dmi->dmi_addr;
                                 if ((*addrs & 0x01) == 0x01) {  /* multicast address? */
 #ifdef HP100_DEBUG
-                                        printk("hp100: %s: multicast = %02x:%02x:%02x:%02x:%02x:%02x, ",
-                                                     dev->name, addrs[0], addrs[1], addrs[2],
-                                                     addrs[3], addrs[4], addrs[5]);
+                                        DECLARE_MAC_BUF(mac);
+                                        printk("hp100: %s: multicast = %s, ",
+                                                     dev->name, print_mac(mac, addrs));
 #endif
                                         for (j = idx = 0; j < 6; j++) {
                                                 idx ^= *addrs++ & 0x3f;
diff --git a/drivers/net/hydra.c b/drivers/net/hydra.c
index 31300a9dd965..b96cf2dcb109 100644
--- a/drivers/net/hydra.c
+++ b/drivers/net/hydra.c
@@ -103,6 +103,7 @@ static int __devinit hydra_init(struct zorro_dev *z)
     int start_page, stop_page;
     int j;
     int err;
+    DECLARE_MAC_BUF(mac);
 
     static u32 hydra_offsets[16] = {
         0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e,
@@ -162,10 +163,8 @@ static int __devinit hydra_init(struct zorro_dev *z)
     zorro_set_drvdata(z, dev);
 
     printk(KERN_INFO "%s: Hydra at 0x%08lx, address "
-           "%02x:%02x:%02x:%02x:%02x:%02x (hydra.c " HYDRA_VERSION ")\n",
-           dev->name, z->resource.start, dev->dev_addr[0], dev->dev_addr[1],
-           dev->dev_addr[2], dev->dev_addr[3], dev->dev_addr[4],
-           dev->dev_addr[5]);
+           "%s (hydra.c " HYDRA_VERSION ")\n",
+           dev->name, z->resource.start, print_mac(mac, dev->dev_addr));
 
     return 0;
 }
diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c
index d7da56b105cb..7d4fa7644e4b 100644
--- a/drivers/net/ibm_emac/ibm_emac_core.c
+++ b/drivers/net/ibm_emac/ibm_emac_core.c
@@ -353,10 +353,9 @@ static void emac_hash_mc(struct ocp_enet_private *dev)
 
         for (dmi = dev->ndev->mc_list; dmi; dmi = dmi->next) {
                 int bit;
-                DBG2("%d: mc %02x:%02x:%02x:%02x:%02x:%02x" NL,
-                     dev->def->index,
-                     dmi->dmi_addr[0], dmi->dmi_addr[1], dmi->dmi_addr[2],
-                     dmi->dmi_addr[3], dmi->dmi_addr[4], dmi->dmi_addr[5]);
+                DECLARE_MAC_BUF(mac);
+                DBG2("%d: mc %s" NL,
+                     dev->def->index, print_mac(mac, dmi->dmi_addr));
 
                 bit = 63 - (ether_crc(ETH_ALEN, dmi->dmi_addr) >> 26);
                 gaht[bit >> 4] |= 0x8000 >> (bit & 0x0f);
@@ -1940,6 +1939,7 @@ static int __init emac_probe(struct ocp_device *ocpdev)
         struct ocp_device *maldev;
         struct ocp_enet_private *dev;
         int err, i;
+        DECLARE_MAC_BUF(mac);
 
         DBG("%d: probe" NL, ocpdev->def->index);
 
@@ -2188,10 +2188,8 @@ static int __init emac_probe(struct ocp_device *ocpdev)
 
         ocp_set_drvdata(ocpdev, dev);
 
-        printk("%s: emac%d, MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
-               ndev->name, dev->def->index,
-               ndev->dev_addr[0], ndev->dev_addr[1], ndev->dev_addr[2],
-               ndev->dev_addr[3], ndev->dev_addr[4], ndev->dev_addr[5]);
+        printk("%s: emac%d, MAC %s\n",
+               ndev->name, dev->def->index, print_mac(mac, ndev->dev_addr));
 
         if (dev->phy.address >= 0)
                 printk("%s: found %s PHY (0x%02x)\n", ndev->name,
diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
index eebf39acf586..91d83aca6bc7 100644
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
@@ -898,6 +898,7 @@ static int ibmlana_probe(struct net_device *dev)
         int base = 0, irq = 0, iobase = 0, memlen = 0;
         ibmlana_priv *priv;
         ibmlana_medium medium;
+        DECLARE_MAC_BUF(mac);
 
         /* can't work without an MCA bus ;-) */
         if (MCA_bus == 0)
@@ -981,11 +982,10 @@ static int ibmlana_probe(struct net_device *dev)
         /* print config */
 
         printk(KERN_INFO "%s: IRQ %d, I/O %#lx, memory %#lx-%#lx, "
-               "MAC address %02x:%02x:%02x:%02x:%02x:%02x.\n",
+               "MAC address %s.\n",
                dev->name, priv->realirq, dev->base_addr,
                dev->mem_start, dev->mem_end - 1,
-               dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-               dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+               print_mac(mac, dev->dev_addr));
         printk(KERN_INFO "%s: %s medium\n", dev->name, MediaNames[priv->medium]);
 
         /* reset board */
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 0636883449fc..228973484ed8 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -1276,16 +1276,13 @@ static int ibmveth_seq_show(struct seq_file *seq, void *v)
         struct ibmveth_adapter *adapter = seq->private;
         char *current_mac = ((char*) &adapter->netdev->dev_addr);
         char *firmware_mac = ((char*) &adapter->mac_addr) ;
+        DECLARE_MAC_BUF(mac);
 
         seq_printf(seq, "%s %s\n\n", ibmveth_driver_string, ibmveth_driver_version);
 
         seq_printf(seq, "Unit Address:    0x%x\n", adapter->vdev->unit_address);
-        seq_printf(seq, "Current MAC:     %02X:%02X:%02X:%02X:%02X:%02X\n",
-                   current_mac[0], current_mac[1], current_mac[2],
-                   current_mac[3], current_mac[4], current_mac[5]);
-        seq_printf(seq, "Firmware MAC:    %02X:%02X:%02X:%02X:%02X:%02X\n",
-                   firmware_mac[0], firmware_mac[1], firmware_mac[2],
-                   firmware_mac[3], firmware_mac[4], firmware_mac[5]);
+        seq_printf(seq, "Current MAC:     %s\n", print_mac(mac, current_mac));
+        seq_printf(seq, "Firmware MAC:    %s\n", print_mac(mac, firmware_mac));
 
         seq_printf(seq, "\nAdapter Statistics:\n");
         seq_printf(seq, "  TX:  vio_map_single failres:      %ld\n", adapter->tx_map_failed);
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 05d2bc15144e..373f72cdbe8e 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -443,18 +443,12 @@ static void ioc3_get_eaddr_nic(struct ioc3_private *ip)
  */
 static void ioc3_get_eaddr(struct ioc3_private *ip)
 {
-        int i;
-
+        DECLARE_MAC_BUF(mac);
 
         ioc3_get_eaddr_nic(ip);
 
-        printk("Ethernet address is ");
-        for (i = 0; i < 6; i++) {
-                printk("%02x", priv_netdev(ip)->dev_addr[i]);
-                if (i < 5)
-                        printk(":");
-        }
-        printk(".\n");
+        printk("Ethernet address is %s.\n",
+               print_mac(mac, priv_netdev(ip)->dev_addr));
 }
 
 static void __ioc3_set_mac_address(struct net_device *dev)
diff --git a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c
index 54178111eec5..d6ff26af37b3 100644
--- a/drivers/net/isa-skeleton.c
+++ b/drivers/net/isa-skeleton.c
@@ -192,6 +192,7 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr)
         static unsigned version_printed;
         int i;
         int err = -ENODEV;
+        DECLARE_MAC_BUF(mac);
 
         /* Grab the region so that no one else tries to probe our ioports. */
         if (!request_region(ioaddr, NETCARD_IO_EXTENT, cardname))
@@ -217,7 +218,9 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr)
 
         /* Retrieve and print the ethernet address. */
         for (i = 0; i < 6; i++)
-                printk(" %2.2x", dev->dev_addr[i] = inb(ioaddr + i));
+                dev->dev_addr[i] = inb(ioaddr + i);
+
+        printk("%s", print_mac(mac, dev->dev_addr));
 
         err = -EAGAIN;
 #ifdef jumpered_interrupts
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
index 13847a3e43e5..d3825c8ee994 100644
--- a/drivers/net/jazzsonic.c
+++ b/drivers/net/jazzsonic.c
@@ -209,6 +209,7 @@ static int __init jazz_sonic_probe(struct platform_device *pdev)
         struct resource *res;
         int err = 0;
         int i;
+        DECLARE_MAC_BUF(mac);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res)
@@ -233,13 +234,8 @@ static int __init jazz_sonic_probe(struct platform_device *pdev)
         if (err)
                 goto out1;
 
-        printk("%s: MAC ", dev->name);
-        for (i = 0; i < 6; i++) {
-                printk("%2.2x", dev->dev_addr[i]);
-                if (i < 5)
-                        printk(":");
-        }
-        printk(" IRQ %d\n", dev->irq);
+        printk("%s: MAC %s IRQ %d\n",
+               dev->name, print_mac(mac, dev->dev_addr), dev->irq);
 
         return 0;
 
diff --git a/drivers/net/lance.c b/drivers/net/lance.c
index 7b17212d687e..977ed3401bb3 100644
--- a/drivers/net/lance.c
+++ b/drivers/net/lance.c
@@ -466,6 +466,7 @@ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int
         unsigned long flags;
         int err = -ENOMEM;
         void __iomem *bios;
+        DECLARE_MAC_BUF(mac);
 
         /* First we look for special cases.
            Check for HP's on-board ethernet by looking for 'HP' in the BIOS.
@@ -522,12 +523,13 @@ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int
         /* We can't allocate dev->priv from alloc_etherdev() because it must
            a ISA DMA-able region. */
         chipname = chip_table[lance_version].name;
-        printk("%s: %s at %#3x,", dev->name, chipname, ioaddr);
+        printk("%s: %s at %#3x, ", dev->name, chipname, ioaddr);
 
         /* There is a 16 byte station address PROM at the base address.
            The first six bytes are the station address. */
         for (i = 0; i < 6; i++)
-                printk(" %2.2x", dev->dev_addr[i] = inb(ioaddr + i));
+                dev->dev_addr[i] = inb(ioaddr + i);
+        printk("%s", print_mac(mac, dev->dev_addr));
 
         dev->base_addr = ioaddr;
         /* Make certain the data structures used by the LANCE are aligned and DMAble. */
diff --git a/drivers/net/lguest_net.c b/drivers/net/lguest_net.c
index 7f34c92bcd86..abce2ee8430a 100644
--- a/drivers/net/lguest_net.c
+++ b/drivers/net/lguest_net.c
@@ -235,9 +235,9 @@ static int lguestnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
         struct lguestnet_info *info = netdev_priv(dev);
         /* Extract the destination ethernet address from the packet. */
         const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest;
+        DECLARE_MAC_BUF(mac);
 
-        pr_debug("%s: xmit %02x:%02x:%02x:%02x:%02x:%02x\n",
-                 dev->name, dest[0],dest[1],dest[2],dest[3],dest[4],dest[5]);
+        pr_debug("%s: xmit %s\n", dev->name, print_mac(mac, dest));
 
         /* If it's a multicast packet, we broadcast to everyone.  That's not
          * very efficient, but there are very few applications which actually
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c
index afa4638052a2..ffaa14f2cd01 100644
--- a/drivers/net/lib82596.c
+++ b/drivers/net/lib82596.c
@@ -1034,15 +1034,12 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 static void print_eth(unsigned char *add, char *str)
 {
-        int i;
+        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mac2);
 
-        printk(KERN_DEBUG "i596 0x%p, ", add);
-        for (i = 0; i < 6; i++)
-                printk(" %02X", add[i + 6]);
-        printk(" -->");
-        for (i = 0; i < 6; i++)
-                printk(" %02X", add[i]);
-        printk(" %02X%02X, %s\n", add[12], add[13], str);
+        printk(KERN_DEBUG "i596 0x%p, %s --> %s %02X%02X, %s\n",
+               add, print_mac(mac, add + 6), print_mac(mac2, add),
+               add[12], add[13], str);
 }
 
 static int __devinit i82596_probe(struct net_device *dev)
@@ -1352,6 +1349,7 @@ static void set_multicast_list(struct net_device *dev)
         struct i596_private *lp = netdev_priv(dev);
         struct i596_dma *dma = lp->dma;
         int config = 0, cnt;
+        DECLARE_MAC_BUF(mac);
 
         DEB(DEB_MULTI,
             printk(KERN_DEBUG
@@ -1415,8 +1413,8 @@ static void set_multicast_list(struct net_device *dev)
                         if (i596_debug > 1)
                                 DEB(DEB_MULTI,
                                     printk(KERN_DEBUG
-                                           "%s: Adding address %02x:%02x:%02x:%02x:%02x:%02x\n",
-                                           dev->name, cp[0], cp[1], cp[2], cp[3], cp[4], cp[5]));
+                                           "%s: Adding address %s\n",
+                                           dev->name, print_mac(mac, cp)));
                 }
                 DMA_WBACK_INV(dev, &dma->mc_cmd, sizeof(struct mc_cmd));
                 i596_add_cmd(dev, &cmd->cmd);
diff --git a/drivers/net/lne390.c b/drivers/net/lne390.c
index 2dd396983213..b36989097883 100644
--- a/drivers/net/lne390.c
+++ b/drivers/net/lne390.c
@@ -169,6 +169,7 @@ static int __init lne390_probe1(struct net_device *dev, int ioaddr)
 {
         int i, revision, ret;
         unsigned long eisa_id;
+        DECLARE_MAC_BUF(mac);
 
         if (inb_p(ioaddr + LNE390_ID_PORT) == 0xff) return -ENODEV;
 
@@ -200,10 +201,12 @@ static int __init lne390_probe1(struct net_device *dev, int ioaddr)
         }
 #endif
 
-        printk("lne390.c: LNE390%X in EISA slot %d, address", 0xa+revision, ioaddr/0x1000);
         for(i = 0; i < ETHER_ADDR_LEN; i++)
-                printk(" %02x", (dev->dev_addr[i] = inb(ioaddr + LNE390_SA_PROM + i)));
-        printk(".\nlne390.c: ");
+                dev->dev_addr[i] = inb(ioaddr + LNE390_SA_PROM + i);
+        printk("lne390.c: LNE390%X in EISA slot %d, address %s.\n",
+               0xa+revision, ioaddr/0x1000, print_mac(mac, dev->dev_addr));
+
+        printk("lne390.c: ");
 
         /* Snarf the interrupt now. CFG file has them all listed as `edge' with share=NO */
         if (dev->irq == 0) {
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c
index f6f3fdfe41db..30854f094965 100644
--- a/drivers/net/mac89x0.c
+++ b/drivers/net/mac89x0.c
@@ -181,6 +181,7 @@ struct net_device * __init mac89x0_probe(int unit)
         unsigned long ioaddr;
         unsigned short sig;
         int err = -ENODEV;
+        DECLARE_MAC_BUF(mac);
 
         dev = alloc_etherdev(sizeof(struct net_local));
         if (!dev)
@@ -272,13 +273,11 @@ struct net_device * __init mac89x0_probe(int unit)
         }
 
         dev->irq = SLOT2IRQ(slot);
-        printk(" IRQ %d ADDR ", dev->irq);
 
-        /* print the ethernet address. */
-        for (i = 0; i < ETH_ALEN; i++)
-                printk("%2.2x%s", dev->dev_addr[i],
-                       ((i < ETH_ALEN-1) ? ":" : ""));
-        printk("\n");
+        /* print the IRQ and ethernet address. */
+
+        printk(" IRQ %d ADDR %s\n",
+               dev->irq, print_mac(mac, dev->dev_addr));
 
         dev->open               = net_open;
         dev->stop               = net_close;
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index c6707580c305..047ea7be4850 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -1071,6 +1071,7 @@ static int __devinit macb_probe(struct platform_device *pdev)
         unsigned long pclk_hz;
         u32 config;
         int err = -ENXIO;
+        DECLARE_MAC_BUF(mac);
 
         regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!regs) {
@@ -1190,10 +1191,9 @@ static int __devinit macb_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, dev);
 
         printk(KERN_INFO "%s: Atmel MACB at 0x%08lx irq %d "
-               "(%02x:%02x:%02x:%02x:%02x:%02x)\n",
+               "(%s)\n",
                dev->name, dev->base_addr, dev->irq,
-               dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-               dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+               print_mac(mac, dev->dev_addr));
 
         phydev = bp->phy_dev;
         printk(KERN_INFO "%s: attached PHY driver [%s] "
diff --git a/drivers/net/mace.c b/drivers/net/mace.c
index ee132b1e09b0..95ebe72f320f 100644
--- a/drivers/net/mace.c
+++ b/drivers/net/mace.c
@@ -101,6 +101,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
         struct mace_data *mp;
         const unsigned char *addr;
         int j, rev, rc = -EBUSY;
+        DECLARE_MAC_BUF(mac);
 
         if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) {
                 printk(KERN_ERR "can't use MACE %s: need 3 addrs and 3 irqs\n",
@@ -240,11 +241,9 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
                 goto err_free_rx_irq;
         }
 
-        printk(KERN_INFO "%s: MACE at", dev->name);
-        for (j = 0; j < 6; ++j) {
-                printk("%c%.2x", (j? ':': ' '), dev->dev_addr[j]);
-        }
-        printk(", chip revision %d.%d\n", mp->chipid >> 8, mp->chipid & 0xff);
+        printk(KERN_INFO "%s: MACE at %s, chip revision %d.%d\n",
+               dev->name, print_mac(mac, dev->dev_addr),
+               mp->chipid >> 8, mp->chipid & 0xff);
 
         return 0;
 
diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c
index 57f7c1a2c1d7..6589239b79ee 100644
--- a/drivers/net/macmace.c
+++ b/drivers/net/macmace.c
@@ -194,6 +194,7 @@ static int __devinit mace_probe(struct platform_device *pdev)
         unsigned char checksum = 0;
         static int found = 0;
         int err;
+        DECLARE_MAC_BUF(mac);
 
         if (found || macintosh_config->ether_type != MAC_ETHER_MACE)
                 return -ENODEV;
@@ -248,9 +249,8 @@ static int __devinit mace_probe(struct platform_device *pdev)
         dev->set_multicast_list = mace_set_multicast;
         dev->set_mac_address    = mace_set_address;
 
-        printk(KERN_INFO "%s: 68K MACE, hardware address %.2X", dev->name, dev->dev_addr[0]);
-        for (j = 1 ; j < 6 ; j++) printk(":%.2X", dev->dev_addr[j]);
-        printk("\n");
+        printk(KERN_INFO "%s: 68K MACE, hardware address %s\n",
+               dev->name, print_mac(mac, dev->dev_addr));
 
         err = register_netdev(dev);
         if (!err)
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c
index a55a8399344c..b267161418ea 100644
--- a/drivers/net/macsonic.c
+++ b/drivers/net/macsonic.c
@@ -223,6 +223,7 @@ int __init mac_onboard_sonic_ethernet_addr(struct net_device* dev)
         struct sonic_local *lp = netdev_priv(dev);
         const int prom_addr = ONBOARD_SONIC_PROM_BASE;
         int i;
+        DECLARE_MAC_BUF(mac);
 
         /* On NuBus boards we can sometimes look in the ROM resources.
            No such luck for comm-slot/onboard. */
@@ -266,13 +267,8 @@ int __init mac_onboard_sonic_ethernet_addr(struct net_device* dev)
                 dev->dev_addr[1] = val >> 8;
                 dev->dev_addr[0] = val & 0xff;
 
-                printk(KERN_INFO "HW Address from CAM 15: ");
-                for (i = 0; i < 6; i++) {
-                        printk("%2.2x", dev->dev_addr[i]);
-                        if (i < 5)
-                                printk(":");
-                }
-                printk("\n");
+                printk(KERN_INFO "HW Address from CAM 15: %s\n",
+                       print_mac(mac, dev->dev_addr));
         } else return 0;
 
         if (memcmp(dev->dev_addr, "\x08\x00\x07", 3) &&
@@ -567,7 +563,7 @@ static int __init mac_sonic_probe(struct platform_device *pdev)
         struct net_device *dev;
         struct sonic_local *lp;
         int err;
-        int i;
+        DECLARE_MAC_BUF(mac);
 
         dev = alloc_etherdev(sizeof(struct sonic_local));
         if (!dev)
@@ -591,13 +587,8 @@ found:
         if (err)
                 goto out;
 
-        printk("%s: MAC ", dev->name);
-        for (i = 0; i < 6; i++) {
-                printk("%2.2x", dev->dev_addr[i]);
-                if (i < 5)
-                        printk(":");
-        }
-        printk(" IRQ %d\n", dev->irq);
+        printk("%s: MAC %s IRQ %d\n",
+               dev->name, print_mac(mac, dev->dev_addr), dev->irq);
 
         return 0;
 
diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index fe5b6c372072..e25dbab67363 100644
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -95,11 +95,11 @@ char o2meth_eaddr[8]={0,0,0,0,0,0,0,0};
 static inline void load_eaddr(struct net_device *dev)
 {
         int i;
-        DPRINTK("Loading MAC Address: %02x:%02x:%02x:%02x:%02x:%02x\n",
-                (int)o2meth_eaddr[0]&0xFF,(int)o2meth_eaddr[1]&0xFF,(int)o2meth_eaddr[2]&0xFF,
-                (int)o2meth_eaddr[3]&0xFF,(int)o2meth_eaddr[4]&0xFF,(int)o2meth_eaddr[5]&0xFF);
+        DECLARE_MAC_BUF(mac);
+
         for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = o2meth_eaddr[i];
+        DPRINTK("Loading MAC Address: %s\n", print_mac(mac, dev->dev_addr));
         mace->eth.mac_addr = (*(unsigned long*)o2meth_eaddr) >> 16;
 }
 
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 34df02cfdbe7..e379165d8375 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -784,6 +784,7 @@ static int mv643xx_eth_open(struct net_device *dev)
         unsigned int port_num = mp->port_num;
         unsigned int size;
         int err;
+        DECLARE_MAC_BUF(mac);
 
         /* Clear any pending ethernet port interrupts */
         mv_write(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num), 0);
@@ -1413,8 +1414,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
 
         p = dev->dev_addr;
         printk(KERN_NOTICE
-                "%s: port %d with MAC address %02x:%02x:%02x:%02x:%02x:%02x\n",
-                dev->name, port_num, p[0], p[1], p[2], p[3], p[4], p[5]);
+                "%s: port %d with MAC address %s\n",
+                dev->name, port_num, print_mac(mac, p));
 
         if (dev->features & NETIF_F_SG)
                 printk(KERN_NOTICE "%s: Scatter Gather Enabled\n", dev->name);
diff --git a/drivers/net/mvme147.c b/drivers/net/mvme147.c
index 837ad0f2b05d..86c9c06433cb 100644
--- a/drivers/net/mvme147.c
+++ b/drivers/net/mvme147.c
@@ -67,6 +67,7 @@ struct net_device * __init mvme147lance_probe(int unit)
         u_long *addr;
         u_long address;
         int err;
+        DECLARE_MAC_BUF(mac);
 
         if (!MACH_IS_MVME147 || called)
                 return ERR_PTR(-ENODEV);
@@ -101,12 +102,10 @@ struct net_device * __init mvme147lance_probe(int unit)
         address=address>>8;
         dev->dev_addr[3]=address&0xff;
 
-        printk("%s: MVME147 at 0x%08lx, irq %d, Hardware Address %02x:%02x:%02x:%02x:%02x:%02x\n",
-                dev->name, dev->base_addr, MVME147_LANCE_IRQ,
-                dev->dev_addr[0],
-                dev->dev_addr[1], dev->dev_addr[2],
-                dev->dev_addr[3], dev->dev_addr[4],
-                dev->dev_addr[5]);
+        printk("%s: MVME147 at 0x%08lx, irq %d, "
+               "Hardware Address %s\n",
+               dev->name, dev->base_addr, MVME147_LANCE_IRQ,
+               print_mac(mac, dev->dev_addr));
 
         lp = (struct m147lance_private *)dev->priv;
         lp->ram = __get_dma_pages(GFP_ATOMIC, 3);       /* 16K */
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 2f8864e70ca9..38b03f538e95 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -2395,6 +2395,7 @@ static void myri10ge_set_multicast_list(struct net_device *dev)
         struct dev_mc_list *mc_list;
         __be32 data[2] = { 0, 0 };
         int err;
+        DECLARE_MAC_BUF(mac);
 
         mgp = netdev_priv(dev);
         /* can be called from atomic contexts,
@@ -2442,14 +2443,8 @@ static void myri10ge_set_multicast_list(struct net_device *dev)
                         printk(KERN_ERR "myri10ge: %s: Failed "
                                "MXGEFW_JOIN_MULTICAST_GROUP, error status:"
                                "%d\t", dev->name, err);
-                        printk(KERN_ERR "MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
-                               ((unsigned char *)&mc_list->dmi_addr)[0],
-                               ((unsigned char *)&mc_list->dmi_addr)[1],
-                               ((unsigned char *)&mc_list->dmi_addr)[2],
-                               ((unsigned char *)&mc_list->dmi_addr)[3],
-                               ((unsigned char *)&mc_list->dmi_addr)[4],
-                               ((unsigned char *)&mc_list->dmi_addr)[5]
-                            );
+                        printk(KERN_ERR "MAC %s\n",
+                               print_mac(mac, mc_list->dmi_addr));
                         goto abort;
                 }
         }
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index 35c4c598c8d2..d68ee51c095f 100644
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@ -311,12 +311,12 @@ static void myri_is_not_so_happy(struct myri_eth *mp)
 #ifdef DEBUG_HEADER
 static void dump_ehdr(struct ethhdr *ehdr)
 {
-        printk("ehdr[h_dst(%02x:%02x:%02x:%02x:%02x:%02x)"
-               "h_source(%02x:%02x:%02x:%02x:%02x:%02x)h_proto(%04x)]\n",
-               ehdr->h_dest[0], ehdr->h_dest[1], ehdr->h_dest[2],
-               ehdr->h_dest[3], ehdr->h_dest[4], ehdr->h_dest[4],
-               ehdr->h_source[0], ehdr->h_source[1], ehdr->h_source[2],
-               ehdr->h_source[3], ehdr->h_source[4], ehdr->h_source[4],
+        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mac2);
+        printk("ehdr[h_dst(%s)"
+               "h_source(%s)"
+               "h_proto(%04x)]\n",
+               print_mac(mac, ehdr->h_dest), print_mac(mac2, ehdr->h_source),
                ehdr->h_proto);
 }
 
@@ -325,13 +325,7 @@ static void dump_ehdr_and_myripad(unsigned char *stuff)
         struct ethhdr *ehdr = (struct ethhdr *) (stuff + 2);
 
         printk("pad[%02x:%02x]", stuff[0], stuff[1]);
-        printk("ehdr[h_dst(%02x:%02x:%02x:%02x:%02x:%02x)"
-               "h_source(%02x:%02x:%02x:%02x:%02x:%02x)h_proto(%04x)]\n",
-               ehdr->h_dest[0], ehdr->h_dest[1], ehdr->h_dest[2],
-               ehdr->h_dest[3], ehdr->h_dest[4], ehdr->h_dest[4],
-               ehdr->h_source[0], ehdr->h_source[1], ehdr->h_source[2],
-               ehdr->h_source[3], ehdr->h_source[4], ehdr->h_source[4],
-               ehdr->h_proto);
+        dump_ehdr(ehdr);
 }
 #endif
 
@@ -895,6 +889,7 @@ static int __devinit myri_ether_init(struct sbus_dev *sdev)
         struct myri_eth *mp;
         unsigned char prop_buf[32];
         int i;
+        DECLARE_MAC_BUF(mac);
 
         DET(("myri_ether_init(%p,%d):\n", sdev, num));
         dev = alloc_etherdev(sizeof(struct myri_eth));
@@ -1089,12 +1084,8 @@ static int __devinit myri_ether_init(struct sbus_dev *sdev)
 
         num++;
 
-        printk("%s: MyriCOM MyriNET Ethernet ", dev->name);
-
-        for (i = 0; i < 6; i++)
-                printk("%2.2x%c", dev->dev_addr[i],
-                       i == 5 ? ' ' : ':');
-        printk("\n");
+        printk("%s: MyriCOM MyriNET Ethernet %s\n",
+               dev->name, print_mac(mac, dev->dev_addr));
 
         return 0;
 
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 5ee4e8795d23..ea38da6d31ff 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -805,6 +805,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
         const int pcibar = 1; /* PCI base address register */
         int prev_eedata;
         u32 tmp;
+        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -958,12 +959,10 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
                 goto err_create_file;
 
         if (netif_msg_drv(np)) {
-                printk(KERN_INFO "natsemi %s: %s at %#08lx (%s), ",
-                        dev->name, natsemi_pci_info[chip_idx].name, iostart,
-                        pci_name(np->pci_dev));
-                for (i = 0; i < ETH_ALEN-1; i++)
-                                printk("%02x:", dev->dev_addr[i]);
-                printk("%02x, IRQ %d", dev->dev_addr[i], irq);
+                printk(KERN_INFO "natsemi %s: %s at %#08lx "
+                       "(%s), %s, IRQ %d",
+                       dev->name, natsemi_pci_info[chip_idx].name, iostart,
+                       pci_name(np->pci_dev), print_mac(mac, dev->dev_addr), irq);
                 if (dev->if_port == PORT_TP)
                         printk(", port TP.\n");
                 else if (np->ignore_phy)
diff --git a/drivers/net/ne-h8300.c b/drivers/net/ne-h8300.c
index 2b85d1b53344..368f2560856d 100644
--- a/drivers/net/ne-h8300.c
+++ b/drivers/net/ne-h8300.c
@@ -204,6 +204,7 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
         static unsigned version_printed;
         struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
         unsigned char bus_width;
+        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -296,12 +297,11 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
 
         dev->base_addr = ioaddr;
 
-        for(i = 0; i < ETHER_ADDR_LEN; i++) {
-                printk(" %2.2x", SA_prom[i]);
+        for(i = 0; i < ETHER_ADDR_LEN; i++)
                 dev->dev_addr[i] = SA_prom[i];
-        }
+        printk(" %s\n", print_mac(mac, dev->dev_addr));
 
-        printk("\n%s: %s found at %#x, using IRQ %d.\n",
+        printk("%s: %s found at %#x, using IRQ %d.\n",
                 dev->name, name, ioaddr, dev->irq);
 
         ei_status.name = name;
diff --git a/drivers/net/ne.c b/drivers/net/ne.c
index 27d87985bb63..874d291cbaed 100644
--- a/drivers/net/ne.c
+++ b/drivers/net/ne.c
@@ -291,6 +291,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
         int neX000, ctron, copam, bad_card;
         int reg0, ret;
         static unsigned version_printed;
+        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -503,16 +504,14 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
         for (i = 0 ; i < ETHER_ADDR_LEN ; i++) {
                 dev->dev_addr[i] = SA_prom[i]
                         = inb_p(ioaddr + EN1_PHYS_SHIFT(i));
-                printk(" %2.2x", SA_prom[i]);
         }
 #else
         for(i = 0; i < ETHER_ADDR_LEN; i++) {
-                printk(" %2.2x", SA_prom[i]);
                 dev->dev_addr[i] = SA_prom[i];
         }
 #endif
 
-        printk("\n");
+        printk("%s\n", print_mac(mac, dev->dev_addr));
 
         ei_status.name = name;
         ei_status.tx_start_page = start_page;
diff --git a/drivers/net/ne2.c b/drivers/net/ne2.c
index f73073b1218a..f4cd8c7e81ba 100644
--- a/drivers/net/ne2.c
+++ b/drivers/net/ne2.c
@@ -302,6 +302,7 @@ out:
 static int ne2_procinfo(char *buf, int slot, struct net_device *dev)
 {
         int len=0;
+        DECLARE_MAC_BUF(mac);
 
         len += sprintf(buf+len, "The NE/2 Ethernet Adapter\n" );
         len += sprintf(buf+len, "Driver written by Wim Dumon ");
@@ -312,12 +313,7 @@ static int ne2_procinfo(char *buf, int slot, struct net_device *dev)
         len += sprintf(buf+len, "Based on the original NE2000 drivers\n" );
         len += sprintf(buf+len, "Base IO: %#x\n", (unsigned int)dev->base_addr);
         len += sprintf(buf+len, "IRQ    : %d\n", dev->irq);
-
-#define HW_ADDR(i) dev->dev_addr[i]
-        len += sprintf(buf+len, "HW addr : %x:%x:%x:%x:%x:%x\n",
-                        HW_ADDR(0), HW_ADDR(1), HW_ADDR(2),
-                        HW_ADDR(3), HW_ADDR(4), HW_ADDR(5) );
-#undef HW_ADDR
+        len += sprintf(buf+len, "HW addr : %s\n", print_mac(mac, dev->dev_addr));
 
         return len;
 }
@@ -330,6 +326,7 @@ static int __init ne2_probe1(struct net_device *dev, int slot)
         const char *name = "NE/2";
         int start_page, stop_page;
         static unsigned version_printed;
+        DECLARE_MAC_BUF(mac);
 
         if (ei_debug && version_printed++ == 0)
                 printk(version);
@@ -469,12 +466,12 @@ static int __init ne2_probe1(struct net_device *dev, int slot)
 
         dev->base_addr = base_addr;
 
-        for(i = 0; i < ETHER_ADDR_LEN; i++) {
-                printk(" %2.2x", SA_prom[i]);
+        for(i = 0; i < ETHER_ADDR_LEN; i++)
                 dev->dev_addr[i] = SA_prom[i];
-        }
 
-        printk("\n%s: %s found at %#x, using IRQ %d.\n",
+        printk(" %s\n", print_mac(mac, dev->dev_addr));
+
+        printk("%s: %s found at %#x, using IRQ %d.\n",
                         dev->name, name, base_addr, dev->irq);
 
         mca_set_adapter_procfn(slot, (MCA_ProcFn) ne2_procinfo, dev);
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index a5879672903e..b569c90da4ba 100644
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -212,6 +212,7 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
         static unsigned int fnd_cnt;
         long ioaddr;
         int flags = pci_clone_list[chip_idx].flags;
+        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -365,12 +366,12 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
         if (i)
                 goto err_out_free_netdev;
 
-        printk("%s: %s found at %#lx, IRQ %d, ",
-                   dev->name, pci_clone_list[chip_idx].name, ioaddr, dev->irq);
-        for(i = 0; i < 6; i++) {
-                printk("%2.2X%s", SA_prom[i], i == 5 ? ".\n": ":");
+        for(i = 0; i < 6; i++)
                 dev->dev_addr[i] = SA_prom[i];
-        }
+        printk("%s: %s found at %#lx, IRQ %d, %s.\n",
+               dev->name, pci_clone_list[chip_idx].name, ioaddr, dev->irq,
+               print_mac(mac, dev->dev_addr));
+
         memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 
         return 0;
diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c
index b1bf8331e872..425043a88db9 100644
--- a/drivers/net/ne3210.c
+++ b/drivers/net/ne3210.c
@@ -99,6 +99,7 @@ static int __init ne3210_eisa_probe (struct device *device)
         int i, retval, port_index;
         struct eisa_device *edev = to_eisa_device (device);
         struct net_device *dev;
+        DECLARE_MAC_BUF(mac);
 
         /* Allocate dev->priv and fill in 8390 specific dev fields. */
         if (!(dev = alloc_ei_netdev ())) {
@@ -127,17 +128,15 @@ static int __init ne3210_eisa_probe (struct device *device)
                 inb(ioaddr + NE3210_CFG1), inb(ioaddr + NE3210_CFG2));
 #endif
 
-
         port_index = inb(ioaddr + NE3210_CFG2) >> 6;
-        printk("ne3210.c: NE3210 in EISA slot %d, media: %s, addr:",
-                edev->slot, ifmap[port_index]);
         for(i = 0; i < ETHER_ADDR_LEN; i++)
-                printk(" %02x", (dev->dev_addr[i] = inb(ioaddr + NE3210_SA_PROM + i)));
-
+                dev->dev_addr[i] = inb(ioaddr + NE3210_SA_PROM + i);
+        printk("ne3210.c: NE3210 in EISA slot %d, media: %s, addr: %s.\n",
+                edev->slot, ifmap[port_index], print_mac(mac, dev->dev_addr));
 
         /* Snarf the interrupt now. CFG file has them all listed as `edge' with share=NO */
         dev->irq = irq_map[(inb(ioaddr + NE3210_CFG2) >> 3) & 0x07];
-        printk(".\nne3210.c: using IRQ %d, ", dev->irq);
+        printk("ne3210.c: using IRQ %d, ", dev->irq);
 
         retval = request_irq(dev->irq, ei_interrupt, 0, DRV_NAME, dev);
         if (retval) {
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 69ef1eb03bea..5ffbb8891647 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -306,18 +306,16 @@ static ssize_t show_remote_ip(struct netconsole_target *nt, char *buf)
 
 static ssize_t show_local_mac(struct netconsole_target *nt, char *buf)
 {
-        return snprintf(buf, PAGE_SIZE, "%02x:%02x:%02x:%02x:%02x:%02x\n",
-                        nt->np.local_mac[0], nt->np.local_mac[1],
-                        nt->np.local_mac[2], nt->np.local_mac[3],
-                        nt->np.local_mac[4], nt->np.local_mac[5]);
+        DECLARE_MAC_BUF(mac);
+        return snprintf(buf, PAGE_SIZE, "%s\n",
+                        print_mac(mac, nt->np.local_mac));
 }
 
 static ssize_t show_remote_mac(struct netconsole_target *nt, char *buf)
 {
-        return snprintf(buf, PAGE_SIZE, "%02x:%02x:%02x:%02x:%02x:%02x\n",
-                        nt->np.remote_mac[0], nt->np.remote_mac[1],
-                        nt->np.remote_mac[2], nt->np.remote_mac[3],
-                        nt->np.remote_mac[4], nt->np.remote_mac[5]);
+        DECLARE_MAC_BUF(mac);
+        return snprintf(buf, PAGE_SIZE, "%s\n",
+                        print_mac(mac, nt->np.remote_mac));
 }
 
 /*
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 1b165a8c74f3..b9cde65e7f31 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -285,6 +285,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         int valid_mac = 0;
         u32 val;
         int pci_func_id = PCI_FUNC(pdev->devfn);
+        DECLARE_MAC_BUF(mac);
 
         printk(KERN_INFO "%s \n", netxen_nic_driver_string);
 
@@ -573,15 +574,9 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 memcpy(netdev->perm_addr, netdev->dev_addr,
                         netdev->addr_len);
                 if (!is_valid_ether_addr(netdev->perm_addr)) {
-                        printk(KERN_ERR "%s: Bad MAC address "
-                                "%02x:%02x:%02x:%02x:%02x:%02x.\n",
-                                netxen_nic_driver_name,
-                                netdev->dev_addr[0],
-                                netdev->dev_addr[1],
-                                netdev->dev_addr[2],
-                                netdev->dev_addr[3],
-                                netdev->dev_addr[4],
-                                netdev->dev_addr[5]);
+                        printk(KERN_ERR "%s: Bad MAC address %s.\n",
+                               netxen_nic_driver_name,
+                               print_mac(mac, netdev->dev_addr));
                 } else {
                         if (adapter->macaddr_set)
                                 adapter->macaddr_set(adapter,
diff --git a/drivers/net/netxen/netxen_nic_niu.c b/drivers/net/netxen/netxen_nic_niu.c
index 05e0577a0e10..5b9e1b300fab 100644
--- a/drivers/net/netxen/netxen_nic_niu.c
+++ b/drivers/net/netxen/netxen_nic_niu.c
@@ -603,6 +603,7 @@ int netxen_niu_macaddr_set(struct netxen_adapter *adapter,
         int phy = physical_port[adapter->portnum];
         unsigned char mac_addr[6];
         int i;
+        DECLARE_MAC_BUF(mac);
 
         for (i = 0; i < 10; i++) {
                 temp[0] = temp[1] = 0;
@@ -627,15 +628,10 @@ int netxen_niu_macaddr_set(struct netxen_adapter *adapter,
         if (i == 10) {
                 printk(KERN_ERR "%s: cannot set Mac addr for %s\n",
                        netxen_nic_driver_name, adapter->netdev->name);
-                printk(KERN_ERR "MAC address set: "
-                       "%02x:%02x:%02x:%02x:%02x:%02x.\n",
-                       addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
-
-                printk(KERN_ERR "MAC address get: "
-                       "%02x:%02x:%02x:%02x:%02x:%02x.\n",
-                       mac_addr[0],
-                       mac_addr[1],
-                       mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]);
+                printk(KERN_ERR "MAC address set: %s.\n",
+                       print_mac(mac, addr));
+                printk(KERN_ERR "MAC address get: %s.\n",
+                       print_mac(mac, mac_addr));
         }
         return 0;
 }
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c
index 1dc74a78afa6..14a768fbce2e 100644
--- a/drivers/net/ni5010.c
+++ b/drivers/net/ni5010.c
@@ -203,6 +203,7 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr)
         unsigned int data = 0;
         int boguscount = 40;
         int err = -ENODEV;
+        DECLARE_MAC_BUF(mac);
 
         dev->base_addr = ioaddr;
         dev->irq = irq;
@@ -268,8 +269,9 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr)
 
         for (i=0; i<6; i++) {
                 outw(i, IE_GP);
-                printk("%2.2x ", dev->dev_addr[i] = inb(IE_SAPROM));
+                dev->dev_addr[i] = inb(IE_SAPROM);
         }
+        printk("%s ", print_mac(mac, dev->dev_addr));
 
         PRINTK2((KERN_DEBUG "%s: I/O #4 passed!\n", dev->name));
 
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index de495b697294..ea71f6d82661 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -1962,6 +1962,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
         long addr;
         int err;
         int using_dac = 0;
+        DECLARE_MAC_BUF(mac);
 
         /* See if we can set the dma mask early on; failure is fatal. */
         if (sizeof(dma_addr_t) == 8 &&
@@ -2226,13 +2227,11 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
                 ndev->features |= NETIF_F_HIGHDMA;
         }
 
-        printk(KERN_INFO "%s: ns83820 v" VERSION ": DP83820 v%u.%u: %02x:%02x:%02x:%02x:%02x:%02x io=0x%08lx irq=%d f=%s\n",
+        printk(KERN_INFO "%s: ns83820 v" VERSION ": DP83820 v%u.%u: %s io=0x%08lx irq=%d f=%s\n",
                 ndev->name,
                 (unsigned)readl(dev->base + SRR) >> 8,
                 (unsigned)readl(dev->base + SRR) & 0xff,
-                ndev->dev_addr[0], ndev->dev_addr[1],
-                ndev->dev_addr[2], ndev->dev_addr[3],
-                ndev->dev_addr[4], ndev->dev_addr[5],
+                print_mac(mac, ndev->dev_addr),
                 addr, pci_dev->irq,
                 (ndev->features & NETIF_F_HIGHDMA) ? "h,sg" : "sg"
                 );
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index f310d94443a0..4d87cd65626f 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -1155,6 +1155,7 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         struct net_device *dev;
         struct pasemi_mac *mac;
         int err;
+        DECLARE_MAC_BUF(mac_buf);
 
         err = pci_enable_device(pdev);
         if (err)
@@ -1237,11 +1238,10 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto out;
         } else
                 printk(KERN_INFO "%s: PA Semi %s: intf %d, txch %d, rxch %d, "
-                       "hw addr %02x:%02x:%02x:%02x:%02x:%02x\n",
+                       "hw addr %s\n",
                        dev->name, mac->type == MAC_TYPE_GMAC ? "GMAC" : "XAUI",
                        mac->dma_if, mac->dma_txch, mac->dma_rxch,
-                       dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-                       dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+                       print_mac(mac_buf, dev->dev_addr));
 
         return err;
 
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c
index 7dace63fb6e6..ed402e00e730 100644
--- a/drivers/net/pci-skeleton.c
+++ b/drivers/net/pci-skeleton.c
@@ -737,6 +737,7 @@ static int __devinit netdrv_init_one (struct pci_dev *pdev,
         int i, addr_len, option;
         void *ioaddr = NULL;
         static int board_idx = -1;
+        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -796,15 +797,11 @@ static int __devinit netdrv_init_one (struct pci_dev *pdev,
 
         tp->phys[0] = 32;
 
-        printk (KERN_INFO "%s: %s at 0x%lx, "
-                "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, "
-                "IRQ %d\n",
+        printk (KERN_INFO "%s: %s at 0x%lx, %sIRQ %d\n",
                 dev->name,
                 board_info[ent->driver_data].name,
                 dev->base_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],
+                print_mac(mac, dev->dev_addr),
                 dev->irq);
 
         printk (KERN_DEBUG "%s:  Identified 8139 chip type '%s'\n",
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 2b395ee21f75..73dcbb7296da 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -343,6 +343,7 @@ static int tc574_config(struct pcmcia_device *link)
         u16 *phys_addr;
         char *cardname;
         union wn3_config config;
+        DECLARE_MAC_BUF(mac);
 
         phys_addr = (u16 *)dev->dev_addr;
 
@@ -458,10 +459,10 @@ static int tc574_config(struct pcmcia_device *link)
 
         strcpy(lp->node.dev_name, dev->name);
 
-        printk(KERN_INFO "%s: %s at io %#3lx, irq %d, hw_addr ",
-                   dev->name, cardname, dev->base_addr, dev->irq);
-        for (i = 0; i < 6; i++)
-                printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : ".\n"));
+        printk(KERN_INFO "%s: %s at io %#3lx, irq %d, "
+               "hw_addr %s.\n",
+               dev->name, cardname, dev->base_addr, dev->irq,
+               print_mac(mac, dev->dev_addr));
         printk(" %dK FIFO split %s Rx:Tx, %sMII interface.\n",
                    8 << config.u.ram_size, ram_split[config.u.ram_split],
                    config.u.autoselect ? "autoselect " : "");
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 2136c80c0581..32076ca6a9e1 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -255,6 +255,7 @@ static int tc589_config(struct pcmcia_device *link)
     int last_fn, last_ret, i, j, multi = 0, fifo;
     kio_addr_t ioaddr;
     char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"};
+    DECLARE_MAC_BUF(mac);
     
     DEBUG(0, "3c589_config(0x%p)\n", link);
 
@@ -330,11 +331,10 @@ static int tc589_config(struct pcmcia_device *link)
 
     strcpy(lp->node.dev_name, dev->name);
 
-    printk(KERN_INFO "%s: 3Com 3c%s, io %#3lx, irq %d, hw_addr ",
-           dev->name, (multi ? "562" : "589"), dev->base_addr,
-           dev->irq);
-    for (i = 0; i < 6; i++)
-        printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : "\n"));
+    printk(KERN_INFO "%s: 3Com 3c%s, io %#3lx, irq %d, "
+           "hw_addr %s\n",
+           dev->name, (multi ? "562" : "589"), dev->base_addr, dev->irq,
+           print_mac(mac, dev->dev_addr));
     printk(KERN_INFO "  %dK FIFO split %s Rx:Tx, %s xcvr\n",
            (fifo & 7) ? 32 : 8, ram_split[(fifo >> 16) & 3],
            if_names[dev->if_port]);
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 28eea206766d..de59313d10f5 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -292,6 +292,7 @@ static int axnet_config(struct pcmcia_device *link)
     cisparse_t parse;
     int i, j, last_ret, last_fn;
     u_short buf[64];
+    DECLARE_MAC_BUF(mac);
 
     DEBUG(0, "axnet_config(0x%p)\n", link);
 
@@ -403,11 +404,11 @@ static int axnet_config(struct pcmcia_device *link)
 
     strcpy(info->node.dev_name, dev->name);
 
-    printk(KERN_INFO "%s: Asix AX88%d90: io %#3lx, irq %d, hw_addr ",
+    printk(KERN_INFO "%s: Asix AX88%d90: io %#3lx, irq %d, "
+           "hw_addr %s\n",
            dev->name, ((info->flags & IS_AX88790) ? 7 : 1),
-           dev->base_addr, dev->irq);
-    for (i = 0; i < 6; i++)
-        printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : "\n"));
+           dev->base_addr, dev->irq,
+           print_mac(mac, dev->dev_addr));
     if (info->phy_id != -1) {
         DEBUG(0, "  MII transceiver at index %d, status %x.\n", info->phy_id, j);
     } else {
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 7f29e95a0644..62844677c784 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -346,6 +346,7 @@ static int fmvj18x_config(struct pcmcia_device *link)
     cardtype_t cardtype;
     char *card_name = "unknown";
     u_char *node_id;
+    DECLARE_MAC_BUF(mac);
 
     DEBUG(0, "fmvj18x_config(0x%p)\n", link);
 
@@ -533,11 +534,10 @@ static int fmvj18x_config(struct pcmcia_device *link)
     strcpy(lp->node.dev_name, dev->name);
 
     /* print current configuration */
-    printk(KERN_INFO "%s: %s, sram %s, port %#3lx, irq %d, hw_addr ", 
+    printk(KERN_INFO "%s: %s, sram %s, port %#3lx, irq %d, "
+           "hw_addr %s\n",
            dev->name, card_name, sram_config == 0 ? "4K TX*2" : "8K TX*2", 
-           dev->base_addr, dev->irq);
-    for (i = 0; i < 6; i++)
-        printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : "\n"));
+           dev->base_addr, dev->irq, print_mac(mac, dev->dev_addr));
 
     return 0;
     
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index 1bb2ffa294de..a355a93b908b 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -658,6 +658,7 @@ static int nmclan_config(struct pcmcia_device *link)
   u_char buf[64];
   int i, last_ret, last_fn;
   kio_addr_t ioaddr;
+  DECLARE_MAC_BUF(mac);
 
   DEBUG(0, "nmclan_config(0x%p)\n", link);
 
@@ -716,10 +717,10 @@ static int nmclan_config(struct pcmcia_device *link)
 
   strcpy(lp->node.dev_name, dev->name);
 
-  printk(KERN_INFO "%s: nmclan: port %#3lx, irq %d, %s port, hw_addr ",
-         dev->name, dev->base_addr, dev->irq, if_names[dev->if_port]);
-  for (i = 0; i < 6; i++)
-      printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : "\n"));
+  printk(KERN_INFO "%s: nmclan: port %#3lx, irq %d, %s port,"
+         " hw_addr %s\n",
+         dev->name, dev->base_addr, dev->irq, if_names[dev->if_port],
+         print_mac(mac, dev->dev_addr));
   return 0;
 
 cs_failed:
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 8ce251cd3209..6a647516c380 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -38,7 +38,7 @@
 #include <linux/delay.h>
 #include <linux/ethtool.h>
 #include <linux/netdevice.h>
-#include <../drivers/net/8390.h>
+#include "../8390.h"
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
@@ -521,6 +521,7 @@ static int pcnet_config(struct pcmcia_device *link)
     int has_shmem = 0;
     u_short buf[64];
     hw_info_t *hw_info;
+    DECLARE_MAC_BUF(mac);
 
     DEBUG(0, "pcnet_config(0x%p)\n", link);
 
@@ -670,9 +671,7 @@ static int pcnet_config(struct pcmcia_device *link)
         printk (" mem %#5lx,", dev->mem_start);
     if (info->flags & HAS_MISC_REG)
         printk(" %s xcvr,", if_names[dev->if_port]);
-    printk(" hw_addr ");
-    for (i = 0; i < 6; i++)
-        printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : "\n"));
+    printk(" hw_addr %s\n", print_mac(mac, dev->dev_addr));
     return 0;
 
 cs_failed:
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index b25f1985d03e..58d716fd17cf 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -962,6 +962,7 @@ static int smc91c92_config(struct pcmcia_device *link)
     int i, j, rev;
     kio_addr_t ioaddr;
     u_long mir;
+    DECLARE_MAC_BUF(mac);
 
     DEBUG(0, "smc91c92_config(0x%p)\n", link);
 
@@ -1074,10 +1075,9 @@ static int smc91c92_config(struct pcmcia_device *link)
     strcpy(smc->node.dev_name, dev->name);
 
     printk(KERN_INFO "%s: smc91c%s rev %d: io %#3lx, irq %d, "
-           "hw_addr ", dev->name, name, (rev & 0x0f), dev->base_addr,
-           dev->irq);
-    for (i = 0; i < 6; i++)
-        printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : "\n"));
+           "hw_addr %s\n",
+           dev->name, name, (rev & 0x0f), dev->base_addr, dev->irq,
+           print_mac(mac, dev->dev_addr));
 
     if (rev > 0) {
         if (mir & 0x3ff)
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index d5c2d2c8c852..c3b69602e275 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -731,6 +731,7 @@ xirc2ps_config(struct pcmcia_device * link)
     u_char buf[64];
     cistpl_lan_node_id_t *node_id = (cistpl_lan_node_id_t*)parse.funce.data;
     cistpl_cftable_entry_t *cf = &parse.cftable_entry;
+    DECLARE_MAC_BUF(mac);
 
     local->dingo_ccr = NULL;
 
@@ -1032,11 +1033,9 @@ xirc2ps_config(struct pcmcia_device * link)
     strcpy(local->node.dev_name, dev->name);
 
     /* give some infos about the hardware */
-    printk(KERN_INFO "%s: %s: port %#3lx, irq %d, hwaddr",
-         dev->name, local->manf_str,(u_long)dev->base_addr, (int)dev->irq);
-    for (i = 0; i < 6; i++)
-        printk("%c%02X", i?':':' ', dev->dev_addr[i]);
-    printk("\n");
+    printk(KERN_INFO "%s: %s: port %#3lx, irq %d, hwaddr %s\n",
+           dev->name, local->manf_str,(u_long)dev->base_addr, (int)dev->irq,
+           print_mac(mac, dev->dev_addr));
 
     return 0;
 
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 2f130e06b6dc..ba2eb04aac9f 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -955,6 +955,7 @@ static int pppoe_seq_show(struct seq_file *seq, void *v)
 {
         struct pppox_sock *po;
         char *dev_name;
+        DECLARE_MAC_BUF(mac);
 
         if (v == SEQ_START_TOKEN) {
                 seq_puts(seq, "Id       Address              Device\n");
@@ -964,11 +965,8 @@ static int pppoe_seq_show(struct seq_file *seq, void *v)
         po = v;
         dev_name = po->pppoe_pa.dev;
 
-        seq_printf(seq, "%08X %02X:%02X:%02X:%02X:%02X:%02X %8s\n",
-                   po->pppoe_pa.sid,
-                   po->pppoe_pa.remote[0], po->pppoe_pa.remote[1],
-                   po->pppoe_pa.remote[2], po->pppoe_pa.remote[3],
-                   po->pppoe_pa.remote[4], po->pppoe_pa.remote[5], dev_name);
+        seq_printf(seq, "%08X %s %8s\n",
+                   po->pppoe_pa.sid, print_mac(mac, po->pppoe_pa.remote), dev_name);
 out:
         return 0;
 }
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index f375bbbd6604..0a42bf517465 100644
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -1348,6 +1348,7 @@ static int gelic_net_setup_netdev(struct gelic_net_card *card)
         unsigned int i;
         int status;
         u64 v1, v2;
+        DECLARE_MAC_BUF(mac);
 
         SET_NETDEV_DEV(netdev, &card->dev->core);
         spin_lock_init(&card->tx_dma_lock);
@@ -1373,10 +1374,8 @@ static int gelic_net_setup_netdev(struct gelic_net_card *card)
         v1 <<= 16;
         memcpy(addr.sa_data, &v1, ETH_ALEN);
         memcpy(netdev->dev_addr, addr.sa_data, ETH_ALEN);
-        dev_info(ctodev(card), "MAC addr %02x:%02x:%02x:%02x:%02x:%02x\n",
-                 netdev->dev_addr[0], netdev->dev_addr[1],
-                 netdev->dev_addr[2], netdev->dev_addr[3],
-                 netdev->dev_addr[4], netdev->dev_addr[5]);
+        dev_info(ctodev(card), "MAC addr %s\n",
+                 print_mac(mac, netdev->dev_addr));
 
         card->vlan_index = -1;  /* no vlan */
         for (i = 0; i < GELIC_NET_VLAN_MAX; i++) {
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 97c6ed07dd15..ed79aa820df2 100755
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -3557,6 +3557,7 @@ static void ql_display_dev_info(struct net_device *ndev)
 {
         struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev);
         struct pci_dev *pdev = qdev->pdev;
+        DECLARE_MAC_BUF(mac);
 
         printk(KERN_INFO PFX
                "\n%s Adapter %d RevisionID %d found %s on PCI slot %d.\n",
@@ -3582,10 +3583,8 @@ static void ql_display_dev_info(struct net_device *ndev)
 
         if (netif_msg_probe(qdev))
                 printk(KERN_INFO PFX
-                       "%s: MAC address %02x:%02x:%02x:%02x:%02x:%02x\n",
-                       ndev->name, ndev->dev_addr[0], ndev->dev_addr[1],
-                       ndev->dev_addr[2], ndev->dev_addr[3], ndev->dev_addr[4],
-                       ndev->dev_addr[5]);
+                       "%s: MAC address %s\n",
+                       ndev->name, print_mac(mac, ndev->dev_addr));
 }
 
 static int ql_adapter_down(struct ql3_adapter *qdev, int do_reset)
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index d43dcf3ed5a9..e7fd08adbbac 100644
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -432,6 +432,7 @@ static int rionet_setup_netdev(struct rio_mport *mport)
         struct net_device *ndev = NULL;
         struct rionet_private *rnet;
         u16 device_id;
+        DECLARE_MAC_BUF(mac);
 
         /* Allocate our net_device structure */
         ndev = alloc_etherdev(sizeof(struct rionet_private));
@@ -472,13 +473,12 @@ static int rionet_setup_netdev(struct rio_mport *mport)
         if (rc != 0)
                 goto out;
 
-        printk("%s: %s %s Version %s, MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
+        printk("%s: %s %s Version %s, MAC %s\n",
                ndev->name,
                DRV_NAME,
                DRV_DESC,
                DRV_VERSION,
-               ndev->dev_addr[0], ndev->dev_addr[1], ndev->dev_addr[2],
-               ndev->dev_addr[3], ndev->dev_addr[4], ndev->dev_addr[5]);
+               print_mac(mac, ndev->dev_addr));
 
       out:
         return rc;
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c
index 03facba05259..19152f54ef2b 100644
--- a/drivers/net/rrunner.c
+++ b/drivers/net/rrunner.c
@@ -520,7 +520,7 @@ static int __devinit rr_init(struct net_device *dev)
         struct rr_regs __iomem *regs;
         struct eeprom *hw = NULL;
         u32 sram_size, rev;
-        int i;
+        DECLARE_MAC_BUF(mac);
 
         rrpriv = netdev_priv(dev);
         regs = rrpriv->regs;
@@ -558,11 +558,7 @@ static int __devinit rr_init(struct net_device *dev)
         *(u32 *)(dev->dev_addr+2) =
           htonl(rr_read_eeprom_word(rrpriv, &hw->manf.BoardULA[4]));
 
-        printk("  MAC: ");
-
-        for (i = 0; i < 5; i++)
-                printk("%2.2x:", dev->dev_addr[i]);
-        printk("%2.2x\n", dev->dev_addr[i]);
+        printk("  MAC: %s\n", print_mac(mac, dev->dev_addr));
 
         sram_size = rr_read_eeprom_word(rrpriv, (void *)8);
         printk("  SRAM size 0x%06x\n", sram_size);
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index a285dd734a03..26895de3e264 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -7417,6 +7417,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
         struct config_param *config;
         int mode;
         u8 dev_intr_type = intr_type;
+        DECLARE_MAC_BUF(mac);
 
         if ((ret = s2io_verify_parm(pdev, &dev_intr_type)))
                 return ret;
@@ -7720,14 +7721,8 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                   sp->product_name, pdev->revision);
         DBG_PRINT(ERR_DBG, "%s: Driver version %s\n", dev->name,
                   s2io_driver_version);
-        DBG_PRINT(ERR_DBG, "%s: MAC ADDR: "
-                          "%02x:%02x:%02x:%02x:%02x:%02x", dev->name,
-                          sp->def_mac_addr[0].mac_addr[0],
-                          sp->def_mac_addr[0].mac_addr[1],
-                          sp->def_mac_addr[0].mac_addr[2],
-                          sp->def_mac_addr[0].mac_addr[3],
-                          sp->def_mac_addr[0].mac_addr[4],
-                          sp->def_mac_addr[0].mac_addr[5]);
+        DBG_PRINT(ERR_DBG, "%s: MAC ADDR: %s\n",
+                  dev->name, print_mac(mac, dev->dev_addr));
         DBG_PRINT(ERR_DBG, "SERIAL NUMBER: %s\n", sp->serial_num);
         if (sp->device_type & XFRAME_II_DEVICE) {
                 mode = s2io_print_pci_mode(sp);
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
index 76e7ee9a6cbc..6001ab47fba0 100644
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
@@ -2407,6 +2407,7 @@ static int sbmac_init(struct net_device *dev, int idx)
         uint64_t ea_reg;
         int i;
         int err;
+        DECLARE_MAC_BUF(mac);
 
         sc = netdev_priv(dev);
 
@@ -2487,10 +2488,8 @@ static int sbmac_init(struct net_device *dev, int idx)
          * was being displayed)
          */
         printk(KERN_INFO
-               "%s: SiByte Ethernet at 0x%08lX, address: %02X:%02X:%02X:%02X:%02X:%02X\n",
-               dev->name, dev->base_addr,
-               eaddr[0],eaddr[1],eaddr[2],eaddr[3],eaddr[4],eaddr[5]);
-
+               "%s: SiByte Ethernet at 0x%08lX, address: %s\n",
+               dev->name, dev->base_addr, print_mac(mac, eaddr));
 
         return 0;
 
diff --git a/drivers/net/seeq8005.c b/drivers/net/seeq8005.c
index 8ef94028cba5..48c64fb20eec 100644
--- a/drivers/net/seeq8005.c
+++ b/drivers/net/seeq8005.c
@@ -158,6 +158,7 @@ static int __init seeq8005_probe1(struct net_device *dev, int ioaddr)
         int old_dmaar;
         int old_rear;
         int retval;
+        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, SEEQ8005_IO_EXTENT, "seeq8005"))
                 return -ENODEV;
@@ -301,7 +302,8 @@ static int __init seeq8005_probe1(struct net_device *dev, int ioaddr)
 
         /* Retrieve and print the ethernet address. */
         for (i = 0; i < 6; i++)
-                printk(" %2.2x", dev->dev_addr[i] = SA_prom[i+6]);
+                dev->dev_addr[i] = SA_prom[i+6];
+        printk("%s", print_mac(mac, dev->dev_addr));
 
         if (dev->irq == 0xff)
                 ;                       /* Do nothing: a user-level program will set it. */
diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c
index 5189ef066884..ff4056310356 100644
--- a/drivers/net/sgiseeq.c
+++ b/drivers/net/sgiseeq.c
@@ -622,6 +622,7 @@ static int __init sgiseeq_probe(struct platform_device *pdev)
         struct sgiseeq_private *sp;
         struct net_device *dev;
         int err, i;
+        DECLARE_MAC_BUF(mac);
 
         dev = alloc_etherdev(sizeof (struct sgiseeq_private));
         if (!dev) {
@@ -695,9 +696,8 @@ static int __init sgiseeq_probe(struct platform_device *pdev)
                 goto err_out_free_page;
         }
 
-        printk(KERN_INFO "%s: %s ", dev->name, sgiseeqstr);
-        for (i = 0; i < 6; i++)
-                printk("%2.2x%c", dev->dev_addr[i], i == 5 ? '\n' : ':');
+        printk(KERN_INFO "%s: %s %s\n",
+               dev->name, sgiseeqstr, print_mac(mac, dev->dev_addr));
 
         return 0;
 
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index 808141b46585..720088396bb9 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -1759,6 +1759,7 @@ static int __devinit sis190_init_one(struct pci_dev *pdev,
         struct net_device *dev;
         void __iomem *ioaddr;
         int rc;
+        DECLARE_MAC_BUF(mac);
 
         if (!printed_version) {
                 net_drv(&debug, KERN_INFO SIS190_DRIVER_NAME " loaded.\n");
@@ -1809,12 +1810,9 @@ static int __devinit sis190_init_one(struct pci_dev *pdev,
                 goto err_remove_mii;
 
         net_probe(tp, KERN_INFO "%s: %s at %p (IRQ: %d), "
-               "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
-               pci_name(pdev), sis_chip_info[ent->driver_data].name,
-               ioaddr, dev->irq,
-               dev->dev_addr[0], dev->dev_addr[1],
-               dev->dev_addr[2], dev->dev_addr[3],
-               dev->dev_addr[4], dev->dev_addr[5]);
+                  "%s\n",
+                  pci_name(pdev), sis_chip_info[ent->driver_data].name,
+                  ioaddr, dev->irq, print_mac(mac, dev->dev_addr));
 
         net_probe(tp, KERN_INFO "%s: %s mode.\n", dev->name,
                   (tp->features & F_HAS_RGMII) ? "RGMII" : "GMII");
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 5da8e671324d..0857d2c88aa0 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -404,6 +404,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
         int i, ret;
         const char *card_name = card_names[pci_id->driver_data];
         const char *dev_name = pci_name(pci_dev);
+        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -533,11 +534,9 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
                 goto err_unmap_rx;
 
         /* print some information about our NIC */
-        printk(KERN_INFO "%s: %s at %#lx, IRQ %d, ", net_dev->name,
-               card_name, ioaddr, net_dev->irq);
-        for (i = 0; i < 5; i++)
-                printk("%2.2x:", (u8)net_dev->dev_addr[i]);
-        printk("%2.2x.\n", net_dev->dev_addr[i]);
+        printk(KERN_INFO "%s: %s at %#lx, IRQ %d, %s\n",
+               net_dev->name, card_name, ioaddr, net_dev->irq,
+               print_mac(mac, net_dev->dev_addr));
 
         /* Detect Wake on Lan support */
         ret = (inl(net_dev->base_addr + CFGPMC) & PMESP) >> 27;
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index cac499f84131..ec1acfddf350 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -3616,12 +3616,11 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
 static void __devinit skge_show_addr(struct net_device *dev)
 {
         const struct skge_port *skge = netdev_priv(dev);
+        DECLARE_MAC_BUF(mac);
 
         if (netif_msg_probe(skge))
-                printk(KERN_INFO PFX "%s: addr %02x:%02x:%02x:%02x:%02x:%02x\n",
-                       dev->name,
-                       dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-                       dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+                printk(KERN_INFO PFX "%s: addr %s\n",
+                       dev->name, print_mac(mac, dev->dev_addr));
 }
 
 static int __devinit skge_probe(struct pci_dev *pdev,
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index b8c15f881eba..a70bcbcf8a16 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -3984,12 +3984,11 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
 static void __devinit sky2_show_addr(struct net_device *dev)
 {
         const struct sky2_port *sky2 = netdev_priv(dev);
+        DECLARE_MAC_BUF(mac);
 
         if (netif_msg_probe(sky2))
-                printk(KERN_INFO PFX "%s: addr %02x:%02x:%02x:%02x:%02x:%02x\n",
-                       dev->name,
-                       dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-                       dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+                printk(KERN_INFO PFX "%s: addr %s\n",
+                       dev->name, print_mac(mac, dev->dev_addr));
 }
 
 /* Handle software interrupt used during MSI test */
diff --git a/drivers/net/smc-mca.c b/drivers/net/smc-mca.c
index 3b43fa8fd088..d6abb68e6e2f 100644
--- a/drivers/net/smc-mca.c
+++ b/drivers/net/smc-mca.c
@@ -196,6 +196,7 @@ static int __init ultramca_probe(struct device *gen_dev)
         int tirq = 0;
         int base_addr = ultra_io[ultra_found];
         int irq = ultra_irq[ultra_found];
+        DECLARE_MAC_BUF(mac);
 
         if (base_addr || irq) {
                 printk(KERN_INFO "Probing for SMC MCA adapter");
@@ -330,10 +331,11 @@ static int __init ultramca_probe(struct device *gen_dev)
         reg4 = inb(ioaddr + 4) & 0x7f;
         outb(reg4, ioaddr + 4);
 
-        printk(KERN_INFO "smc_mca[%d]: Parameters: %#3x,", slot + 1, ioaddr);
-
         for (i = 0; i < 6; i++)
-                printk(" %2.2X", dev->dev_addr[i] = inb(ioaddr + 8 + i));
+                dev->dev_addr[i] = inb(ioaddr + 8 + i);
+
+        printk(KERN_INFO "smc_mca[%d]: Parameters: %#3x, %s",
+               slot + 1, ioaddr, print_mac(mac, dev->dev_addr));
 
         /* Switch from the station address to the alternate register set
          * and read the useful registers there.
diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c
index d02bd7bc1bae..00d6cf1af484 100644
--- a/drivers/net/smc-ultra.c
+++ b/drivers/net/smc-ultra.c
@@ -198,6 +198,7 @@ static int __init ultra_probe1(struct net_device *dev, int ioaddr)
         unsigned char num_pages, irqreg, addr, piomode;
         unsigned char idreg = inb(ioaddr + 7);
         unsigned char reg4 = inb(ioaddr + 4) & 0x7f;
+        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, ULTRA_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -224,10 +225,11 @@ static int __init ultra_probe1(struct net_device *dev, int ioaddr)
 
         model_name = (idreg & 0xF0) == 0x20 ? "SMC Ultra" : "SMC EtherEZ";
 
-        printk("%s: %s at %#3x,", dev->name, model_name, ioaddr);
-
         for (i = 0; i < 6; i++)
-                printk(" %2.2X", dev->dev_addr[i] = inb(ioaddr + 8 + i));
+                dev->dev_addr[i] = inb(ioaddr + 8 + i);
+
+        printk("%s: %s at %#3x, %s", dev->name, model_name,
+               ioaddr, print_mac(mac, dev->dev_addr));
 
         /* Switch from the station address to the alternate register set and
            read the useful registers there. */
diff --git a/drivers/net/smc-ultra32.c b/drivers/net/smc-ultra32.c
index 043a5002029c..a5a91ace28cc 100644
--- a/drivers/net/smc-ultra32.c
+++ b/drivers/net/smc-ultra32.c
@@ -163,6 +163,7 @@ static int __init ultra32_probe1(struct net_device *dev, int ioaddr)
         unsigned char idreg;
         unsigned char reg4;
         const char *ifmap[] = {"UTP No Link", "", "UTP/AUI", "UTP/BNC"};
+        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, ULTRA32_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -203,10 +204,11 @@ static int __init ultra32_probe1(struct net_device *dev, int ioaddr)
 
         model_name = "SMC Ultra32";
 
-        printk("%s: %s at 0x%X,", dev->name, model_name, ioaddr);
-
         for (i = 0; i < 6; i++)
-                printk(" %2.2X", dev->dev_addr[i] = inb(ioaddr + 8 + i));
+                dev->dev_addr[i] = inb(ioaddr + 8 + i);
+
+        printk("%s: %s at 0x%X, %s",
+               dev->name, model_name, ioaddr, print_mac(mac, dev->dev_addr));
 
         /* Switch from the station address to the alternate register set and
            read the useful registers there. */
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c
index 5b6748e3ea0e..cb2698de5190 100644
--- a/drivers/net/smc9194.c
+++ b/drivers/net/smc9194.c
@@ -876,6 +876,8 @@ static int __init smc_probe(struct net_device *dev, int ioaddr)
         word memory_info_register;
         word memory_cfg_register;
 
+        DECLARE_MAC_BUF(mac);
+
         /* Grab the region so that no one else tries to probe our ioports. */
         if (!request_region(ioaddr, SMC_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -1031,10 +1033,7 @@ static int __init smc_probe(struct net_device *dev, int ioaddr)
         /*
          . Print the Ethernet address
         */
-        printk("ADDR: ");
-        for (i = 0; i < 5; i++)
-                printk("%2.2x:", dev->dev_addr[i] );
-        printk("%2.2x \n", dev->dev_addr[5] );
+        printk("ADDR: %s\n", print_mac(mac, dev->dev_addr));
 
         /* set the private data to zero by default */
         memset(dev->priv, 0, sizeof(struct smc_local));
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index fe28d277f21a..24e610e711e8 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -1822,9 +1822,10 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr)
 {
         struct smc_local *lp = netdev_priv(dev);
         static int version_printed = 0;
-        int i, retval;
+        int retval;
         unsigned int val, revision_register;
         const char *version_string;
+        DECLARE_MAC_BUF(mac);
 
         DBG(2, "%s: %s\n", CARDNAME, __FUNCTION__);
 
@@ -2014,10 +2015,8 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr)
                                "set using ifconfig\n", dev->name);
                 } else {
                         /* Print the Ethernet address */
-                        printk("%s: Ethernet addr: ", dev->name);
-                        for (i = 0; i < 5; i++)
-                                printk("%2.2x:", dev->dev_addr[i]);
-                        printk("%2.2x\n", dev->dev_addr[5]);
+                        printk("%s: Ethernet addr: %s\n",
+                               dev->name, print_mac(mac, dev->dev_addr));
                 }
 
                 if (lp->phy_type == 0) {
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index 5785429ca0e2..ea253754763a 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -694,6 +694,7 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
         void __iomem *base;
         int drv_flags, io_size;
         int boguscnt;
+        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -863,11 +864,9 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
         if (register_netdev(dev))
                 goto err_out_cleardev;
 
-        printk(KERN_INFO "%s: %s at %p, ",
-                   dev->name, netdrv_tbl[chip_idx].name, base);
-        for (i = 0; i < 5; i++)
-                printk("%2.2x:", dev->dev_addr[i]);
-        printk("%2.2x, IRQ %d.\n", dev->dev_addr[i], irq);
+        printk(KERN_INFO "%s: %s at %p, %s, IRQ %d.\n",
+               dev->name, netdrv_tbl[chip_idx].name, base,
+               print_mac(mac, dev->dev_addr), irq);
 
         if (drv_flags & CanHaveMII) {
                 int phy, phy_idx = 0;
@@ -1472,13 +1471,16 @@ static int __netdev_rx(struct net_device *dev, int *quota)
                 }
 #ifndef final_version                   /* Remove after testing. */
                 /* You will want this info for the initial debug. */
-                if (debug > 5)
-                        printk(KERN_DEBUG "  Rx data %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:"
-                               "%2.2x %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x %2.2x%2.2x.\n",
-                               skb->data[0], skb->data[1], skb->data[2], skb->data[3],
-                               skb->data[4], skb->data[5], skb->data[6], skb->data[7],
-                               skb->data[8], skb->data[9], skb->data[10],
-                               skb->data[11], skb->data[12], skb->data[13]);
+                if (debug > 5) {
+                        DECLARE_MAC_BUF(mac);
+                        DECLARE_MAC_BUF(mac2);
+
+                        printk(KERN_DEBUG "  Rx data %s %s"
+                               " %2.2x%2.2x.\n",
+                               print_mac(mac, &skb->data[0]),
+                               print_mac(mac2, &skb->data[6]),
+                               skb->data[12], skb->data[13]);
+                }
 #endif
 
                 skb->protocol = eth_type_trans(skb, dev);
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c
index f8fbc0492706..f8d46134daca 100644
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
@@ -300,6 +300,7 @@ static int __init lance_probe( struct net_device *dev)
         static int              did_version;
         volatile unsigned short *ioaddr_probe;
         unsigned short tmp1, tmp2;
+        DECLARE_MAC_BUF(mac);
 
 #ifdef CONFIG_SUN3
         ioaddr = (unsigned long)ioremap(LANCE_OBIO, PAGE_SIZE);
@@ -375,8 +376,7 @@ static int __init lance_probe( struct net_device *dev)
         MEM->init.hwaddr[4] = dev->dev_addr[5];
         MEM->init.hwaddr[5] = dev->dev_addr[4];
 
-        for( i = 0; i < 6; ++i )
-                printk( "%02x%s", dev->dev_addr[i], (i < 5) ? ":" : "\n" );
+        printk("%s\n", print_mac(mac, dev->dev_addr));
 
         MEM->init.mode = 0x0000;
         MEM->init.filter[0] = 0x00000000;
@@ -590,17 +590,12 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
         /* Fill in a Tx ring entry */
 #if 0
         if (lance_debug >= 2) {
-                u_char *p;
-                int i;
-                printk( "%s: TX pkt %d type 0x%04x from ", dev->name,
-                        lp->new_tx, ((u_short *)skb->data)[6]);
-                for( p = &((u_char *)skb->data)[6], i = 0; i < 6; i++ )
-                        printk("%02x%s", *p++, i != 5 ? ":" : "" );
-                printk(" to ");
-                for( p = (u_char *)skb->data, i = 0; i < 6; i++ )
-                        printk("%02x%s", *p++, i != 5 ? ":" : "" );
-                printk(" data at 0x%08x len %d\n", (int)skb->data,
-                       (int)skb->len );
+                printk( "%s: TX pkt %d type 0x%04x"
+                        " from %s to %s"
+                        " data at 0x%08x len %d\n",
+                        dev->name, lp->new_tx, ((u_short *)skb->data)[6],
+                        DEV_ADDR(&skb->data[6]), DEV_ADDR(skb->data),
+                        (int)skb->data, (int)skb->len );
         }
 #endif
         /* We're not prepared for the int until the last flags are set/reset.
@@ -825,13 +820,14 @@ static int lance_rx( struct net_device *dev )
 
 #if 0
                                 if (lance_debug >= 3) {
-                                        u_char *data = PKTBUF_ADDR(head), *p;
-                                        printk( "%s: RX pkt %d type 0x%04x from ", dev->name, entry, ((u_short *)data)[6]);
-                                        for( p = &data[6], i = 0; i < 6; i++ )
-                                                printk("%02x%s", *p++, i != 5 ? ":" : "" );
-                                        printk(" to ");
-                                        for( p = data, i = 0; i < 6; i++ )
-                                                printk("%02x%s", *p++, i != 5 ? ":" : "" );
+                                        u_char *data = PKTBUF_ADDR(head);
+                                        DECLARE_MAC_BUF(mac);
+                                        DECLARE_MAC_BUF(mac2)
+                                        printk("%s: RX pkt %d type 0x%04x"
+                                               " from %s to %s",
+                                               dev->name, lp->new_tx, ((u_short *)data)[6],
+                                               print_mac(mac, &data[6]), print_mac(mac2, data));
+
                                         printk(" data %02x %02x %02x %02x %02x %02x %02x %02x "
                                                "len %d at %08x\n",
                                                data[15], data[16], data[17], data[18],
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index 4ba3e4857e90..fe3ac6f9ae89 100644
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -1082,6 +1082,7 @@ static int __init bigmac_ether_init(struct sbus_dev *qec_sdev)
         struct bigmac *bp;
         u8 bsizes, bsizes_more;
         int i;
+        DECLARE_MAC_BUF(mac);
 
         /* Get a new device struct for this interface. */
         dev = alloc_etherdev(sizeof(struct bigmac));
@@ -1226,11 +1227,8 @@ static int __init bigmac_ether_init(struct sbus_dev *qec_sdev)
 
         dev_set_drvdata(&bp->bigmac_sdev->ofdev.dev, bp);
 
-        printk(KERN_INFO "%s: BigMAC 100baseT Ethernet ", dev->name);
-        for (i = 0; i < 6; i++)
-                printk("%2.2x%c", dev->dev_addr[i],
-                       i == 5 ? ' ' : ':');
-        printk("\n");
+        printk(KERN_INFO "%s: BigMAC 100baseT Ethernet %s\n",
+               dev->name, print_mac(mac, dev->dev_addr));
 
         return 0;
 
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index 3c553dcc2b9d..a37637ec9b77 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -467,7 +467,7 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
         int bar = 1;
 #endif
         int phy, phy_idx = 0;
-
+        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -546,11 +546,9 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
         if (i)
                 goto err_out_unmap_rx;
 
-        printk(KERN_INFO "%s: %s at %p, ",
-                   dev->name, pci_id_tbl[chip_idx].name, ioaddr);
-        for (i = 0; i < 5; i++)
-                        printk("%2.2x:", dev->dev_addr[i]);
-        printk("%2.2x, IRQ %d.\n", dev->dev_addr[i], irq);
+        printk(KERN_INFO "%s: %s at %p, %s, IRQ %d.\n",
+               dev->name, pci_id_tbl[chip_idx].name, ioaddr,
+               print_mac(mac, dev->dev_addr), irq);
 
         np->phys[0] = 1;                /* Default setting */
         np->mii_preamble_required++;
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 869ac44c51f3..53b8344a68ef 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2965,7 +2965,8 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
         unsigned long gemreg_base, gemreg_len;
         struct net_device *dev;
         struct gem *gp;
-        int i, err, pci_using_dac;
+        int err, pci_using_dac;
+        DECLARE_MAC_BUF(mac);
 
         if (gem_version_printed++ == 0)
                 printk(KERN_INFO "%s", version);
@@ -3149,12 +3150,9 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
                 goto err_out_free_consistent;
         }
 
-        printk(KERN_INFO "%s: Sun GEM (PCI) 10/100/1000BaseT Ethernet ",
-               dev->name);
-        for (i = 0; i < 6; i++)
-                printk("%2.2x%c", dev->dev_addr[i],
-                       i == 5 ? ' ' : ':');
-        printk("\n");
+        printk(KERN_INFO "%s: Sun GEM (PCI) 10/100/1000BaseT Ethernet "
+               "%s\n",
+               dev->name, print_mac(mac, dev->dev_addr));
 
         if (gp->phy_type == phy_mii_mdio0 ||
             gp->phy_type == phy_mii_mdio1)
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 170580c13127..120c8affe83d 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2664,6 +2664,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe
         struct net_device *dev;
         int i, qfe_slot = -1;
         int err = -ENODEV;
+        DECLARE_MAC_BUF(mac);
 
         if (is_qfe) {
                 qp = quattro_sbus_find(sdev);
@@ -2850,10 +2851,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe
                 printk(KERN_INFO "%s: HAPPY MEAL (SBUS) 10/100baseT Ethernet ",
                        dev->name);
 
-        for (i = 0; i < 6; i++)
-                printk("%2.2x%c",
-                       dev->dev_addr[i], i == 5 ? ' ' : ':');
-        printk("\n");
+        printk("%s\n", print_mac(mac, dev->dev_addr));
 
         return 0;
 
@@ -2988,6 +2986,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
         int i, qfe_slot = -1;
         char prom_name[64];
         int err;
+        DECLARE_MAC_BUF(mac);
 
         /* Now make sure pci_dev cookie is there. */
 #ifdef CONFIG_SPARC
@@ -3201,10 +3200,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
                 printk(KERN_INFO "%s: HAPPY MEAL (PCI/CheerIO) 10/100BaseT Ethernet ",
                        dev->name);
 
-        for (i = 0; i < 6; i++)
-                printk("%2.2x%c", dev->dev_addr[i], i == 5 ? ' ' : ':');
-
-        printk("\n");
+        printk("%s\n", print_mac(mac, dev->dev_addr));
 
         return 0;
 
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 7bf5c90b7749..26ade68aeabf 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -1321,6 +1321,7 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
         struct net_device *dev;
         struct lance_private *lp;
         int    i;
+        DECLARE_MAC_BUF(mac);
 
         dev = alloc_etherdev(sizeof(struct lance_private) + 8);
         if (!dev)
@@ -1478,12 +1479,8 @@ no_link_test:
 
         dev_set_drvdata(&sdev->ofdev.dev, lp);
 
-        printk(KERN_INFO "%s: LANCE ", dev->name);
-
-        for (i = 0; i < 6; i++)
-                printk("%2.2x%c", dev->dev_addr[i],
-                       i == 5 ? ' ': ':');
-        printk("\n");
+        printk(KERN_INFO "%s: LANCE %s\n",
+               dev->name, print_mac(mac, dev->dev_addr));
 
         return 0;
 
diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
index 22fad5112406..124cfd4fbcf4 100644
--- a/drivers/net/tokenring/abyss.c
+++ b/drivers/net/tokenring/abyss.c
@@ -97,8 +97,9 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
         static int versionprinted;
         struct net_device *dev;
         struct net_local *tp;
-        int i, ret, pci_irq_line;
+        int ret, pci_irq_line;
         unsigned long pci_ioaddr;
+        DECLARE_MAC_BUF(mac);
         
         if (versionprinted++ == 0)
                 printk("%s", version);
@@ -145,12 +146,9 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
         }
 
         abyss_read_eeprom(dev);
-                
-        printk("%s:    Ring Station Address: ", dev->name);
-        printk("%2.2x", dev->dev_addr[0]);
-        for (i = 1; i < 6; i++)
-                printk(":%2.2x", dev->dev_addr[i]);
-        printk("\n");
+
+        printk("%s:    Ring Station Address: %s\n",
+               dev->name, print_mac(mac, dev->dev_addr));
 
         tp = netdev_priv(dev);
         tp->setnselout = abyss_setnselout_pins;
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index 65e21eb7e685..e494c63bfbd9 100644
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -389,6 +389,7 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr)
         unsigned long timeout;
         static int version_printed;
 #endif
+        DECLARE_MAC_BUF(mac);
 
         /*    Query the adapter PIO base port which will return
          *    indication of where MMIO was placed. We also have a
@@ -702,9 +703,8 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr)
                 channel_def[cardpresent - 1], adapter_def(ti->adapter_type));
         DPRINTK("using irq %d, PIOaddr %hx, %dK shared RAM.\n",
                         irq, PIOaddr, ti->mapped_ram_size / 2);
-        DPRINTK("Hardware address : %02X:%02X:%02X:%02X:%02X:%02X\n",
-                dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-                dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+        DPRINTK("Hardware address : %s\n",
+                print_mac(mac, dev->dev_addr));
         if (ti->page_mask)
                 DPRINTK("Shared RAM paging enabled. "
                         "Page size: %uK Shared Ram size %dK\n",
@@ -1739,18 +1739,20 @@ static void tr_rx(struct net_device *dev)
         if (!IPv4_p) {
 
                 void __iomem *trhhdr = rbuf + offsetof(struct rec_buf, data);
-
+                u8 saddr[6];
+                u8 daddr[6];
+                DECLARE_MAC_BUF(mac);
+                DECLARE_MAC_BUF(mac2);
+                int i;
+                for (i = 0 ; i < 6 ; i++)
+                        saddr[i] = readb(trhhdr + SADDR_OFST + i);
+                for (i = 0 ; i < 6 ; i++)
+                        daddr[i] = readb(trhhdr + DADDR_OFST + i);
                 DPRINTK("Probably non-IP frame received.\n");
                 DPRINTK("ssap: %02X dsap: %02X "
-                        "saddr: %02X:%02X:%02X:%02X:%02X:%02X "
-                        "daddr: %02X:%02X:%02X:%02X:%02X:%02X\n",
+                        "saddr: %s daddr: %$s\n",
                         readb(llc + SSAP_OFST), readb(llc + DSAP_OFST),
-                        readb(trhhdr+SADDR_OFST), readb(trhhdr+ SADDR_OFST+1),
-                        readb(trhhdr+SADDR_OFST+2), readb(trhhdr+SADDR_OFST+3),
-                        readb(trhhdr+SADDR_OFST+4), readb(trhhdr+SADDR_OFST+5),
-                        readb(trhhdr+DADDR_OFST), readb(trhhdr+DADDR_OFST + 1),
-                        readb(trhhdr+DADDR_OFST+2), readb(trhhdr+DADDR_OFST+3),
-                        readb(trhhdr+DADDR_OFST+4), readb(trhhdr+DADDR_OFST+5));
+                        print_mac(mac, saddr), print_mac(mac2, daddr));
         }
 #endif
 
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index f114fb729f54..47d84cd28097 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -447,6 +447,9 @@ static int streamer_reset(struct net_device *dev)
         unsigned int uaa_addr;
         struct sk_buff *skb = NULL;
         __u16 misr;
+#if STREAMER_DEBUG
+        DECLARE_MAC_BUF(mac);
+#endif
 
         streamer_priv = netdev_priv(dev);
         streamer_mmio = streamer_priv->streamer_mmio;
@@ -575,11 +578,8 @@ static int streamer_reset(struct net_device *dev)
                         dev->dev_addr[i+1]= addr & 0xff;
                 }
 #if STREAMER_DEBUG
-                printk("Adapter address: ");
-                for (i = 0; i < 6; i++) {
-                        printk("%02x:", dev->dev_addr[i]);
-                }
-                printk("\n");
+                printk("Adapter address: %s\n",
+                       print_mac(mac, dev->dev_addr));
 #endif
         }
         return 0;
@@ -1539,6 +1539,7 @@ static void streamer_arb_cmd(struct net_device *dev)
 
 #if STREAMER_NETWORK_MONITOR
         struct trh_hdr *mac_hdr;
+        DECLARE_MAC_BUF(mac);
 #endif
 
         writew(streamer_priv->arb, streamer_mmio + LAPA);
@@ -1611,15 +1612,11 @@ static void streamer_arb_cmd(struct net_device *dev)
                        dev->name);
                 mac_hdr = tr_hdr(mac_frame);
                 printk(KERN_WARNING
-                       "%s: MAC Frame Dest. Addr: %02x:%02x:%02x:%02x:%02x:%02x \n",
-                       dev->name, mac_hdr->daddr[0], mac_hdr->daddr[1],
-                       mac_hdr->daddr[2], mac_hdr->daddr[3],
-                       mac_hdr->daddr[4], mac_hdr->daddr[5]);
+                       "%s: MAC Frame Dest. Addr: %s\n",
+                       dev->name, print_mac(mac, mac_hdr->daddr));
                 printk(KERN_WARNING
-                       "%s: MAC Frame Srce. Addr: %02x:%02x:%02x:%02x:%02x:%02x \n",
-                       dev->name, mac_hdr->saddr[0], mac_hdr->saddr[1],
-                       mac_hdr->saddr[2], mac_hdr->saddr[3],
-                       mac_hdr->saddr[4], mac_hdr->saddr[5]);
+                       "%s: MAC Frame Srce. Addr: %s\n",
+                       dev->name, DEV->ADDR6(mac_hdr->saddr));
 #endif
                 netif_rx(mac_frame);
 
@@ -1854,6 +1851,8 @@ static int sprintf_info(char *buffer, struct net_device *dev)
         struct streamer_parameters_table spt;
         int size = 0;
         int i;
+        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mac2);
 
         writew(streamer_priv->streamer_addr_table_addr, streamer_mmio + LAPA);
         for (i = 0; i < 14; i += 2) {
@@ -1875,37 +1874,30 @@ static int sprintf_info(char *buffer, struct net_device *dev)
         size = sprintf(buffer, "\n%6s: Adapter Address   : Node Address      : Functional Addr\n", dev->name);
 
         size += sprintf(buffer + size,
-                    "%6s: %02x:%02x:%02x:%02x:%02x:%02x : %02x:%02x:%02x:%02x:%02x:%02x : %02x:%02x:%02x:%02x\n",
-                    dev->name, dev->dev_addr[0], dev->dev_addr[1],
-                    dev->dev_addr[2], dev->dev_addr[3], dev->dev_addr[4],
-                    dev->dev_addr[5], sat.node_addr[0], sat.node_addr[1],
-                    sat.node_addr[2], sat.node_addr[3], sat.node_addr[4],
-                    sat.node_addr[5], sat.func_addr[0], sat.func_addr[1],
-                    sat.func_addr[2], sat.func_addr[3]);
+                        "%6s: %s : %s : %02x:%02x:%02x:%02x\n",
+                        dev->name, print_mac(mac, dev->dev_addr),
+                        print_mac(mac2, sat.node_addr),
+                        sat.func_addr[0], sat.func_addr[1],
+                        sat.func_addr[2], sat.func_addr[3]);
 
         size += sprintf(buffer + size, "\n%6s: Token Ring Parameters Table:\n", dev->name);
 
         size += sprintf(buffer + size, "%6s: Physical Addr : Up Node Address   : Poll Address      : AccPri : Auth Src : Att Code :\n", dev->name);
 
         size += sprintf(buffer + size,
-                    "%6s: %02x:%02x:%02x:%02x   : %02x:%02x:%02x:%02x:%02x:%02x : %02x:%02x:%02x:%02x:%02x:%02x : %04x   : %04x     :  %04x    :\n",
+                    "%6s: %02x:%02x:%02x:%02x   : %s : %s : %04x   : %04x     :  %04x    :\n",
                     dev->name, spt.phys_addr[0], spt.phys_addr[1],
                     spt.phys_addr[2], spt.phys_addr[3],
-                    spt.up_node_addr[0], spt.up_node_addr[1],
-                    spt.up_node_addr[2], spt.up_node_addr[3],
-                    spt.up_node_addr[4], spt.up_node_addr[4],
-                    spt.poll_addr[0], spt.poll_addr[1], spt.poll_addr[2],
-                    spt.poll_addr[3], spt.poll_addr[4], spt.poll_addr[5],
+                    print_mac(mac, spt.up_node_addr),
+                    print_mac(mac2, spt.poll_addr),
                     ntohs(spt.acc_priority), ntohs(spt.auth_source_class),
                     ntohs(spt.att_code));
 
         size += sprintf(buffer + size, "%6s: Source Address    : Bcn T : Maj. V : Lan St : Lcl Rg : Mon Err : Frame Correl : \n", dev->name);
 
         size += sprintf(buffer + size,
-                    "%6s: %02x:%02x:%02x:%02x:%02x:%02x : %04x  : %04x   : %04x   : %04x   : %04x    :     %04x     : \n",
-                    dev->name, spt.source_addr[0], spt.source_addr[1],
-                    spt.source_addr[2], spt.source_addr[3],
-                    spt.source_addr[4], spt.source_addr[5],
+                    "%6s: %s : %04x  : %04x   : %04x   : %04x   : %04x    :     %04x     : \n",
+                    dev->name, print_mac(mac, spt.source_addr),
                     ntohs(spt.beacon_type), ntohs(spt.major_vector),
                     ntohs(spt.lan_status), ntohs(spt.local_ring),
                     ntohs(spt.mon_error), ntohs(spt.frame_correl));
@@ -1914,14 +1906,12 @@ static int sprintf_info(char *buffer, struct net_device *dev)
                     dev->name);
 
         size += sprintf(buffer + size,
-                    "%6s:                :  %02x  :  %02x  : %02x:%02x:%02x:%02x:%02x:%02x : %02x:%02x:%02x:%02x    : \n",
+                    "%6s:                :  %02x  :  %02x  : %s : %02x:%02x:%02x:%02x    : \n",
                     dev->name, ntohs(spt.beacon_transmit),
-                    ntohs(spt.beacon_receive), spt.beacon_naun[0],
-                    spt.beacon_naun[1], spt.beacon_naun[2],
-                    spt.beacon_naun[3], spt.beacon_naun[4],
-                    spt.beacon_naun[5], spt.beacon_phys[0],
-                    spt.beacon_phys[1], spt.beacon_phys[2],
-                    spt.beacon_phys[3]);
+                    ntohs(spt.beacon_receive),
+                    print_mac(mac, spt.beacon_naun),
+                    spt.beacon_phys[0], spt.beacon_phys[1],
+                    spt.beacon_phys[2], spt.beacon_phys[3]);
         return size;
 }
 #endif
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index d0ce2ce675d5..5a4151362fc0 100644
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -151,7 +151,8 @@ static int __devinit madgemc_probe(struct device *device)
         struct net_local *tp;
         struct card_info *card;
         struct mca_device *mdev = to_mca_device(device);
-        int ret = 0, i = 0;
+        int ret = 0;
+        DECLARE_MAC_BUF(mac);
 
         if (versionprinted++ == 0)
                 printk("%s", version);
@@ -322,11 +323,8 @@ static int __devinit madgemc_probe(struct device *device)
         mca_device_set_name(mdev, (card->cardtype == 0x08)?MADGEMC16_CARDNAME:MADGEMC32_CARDNAME);
         mca_set_adapter_procfn(mdev->slot, madgemc_mcaproc, dev);
 
-        printk("%s:     Ring Station Address: ", dev->name);
-        printk("%2.2x", dev->dev_addr[0]);
-        for (i = 1; i < 6; i++)
-                printk(":%2.2x", dev->dev_addr[i]);
-        printk("\n");
+        printk("%s:     Ring Station Address: %s\n",
+               dev->name, print_mac(mac, dev->dev_addr));
 
         if (tmsdev_init(dev, device)) {
                 printk("%s: unable to get memory for dev->priv.\n", 
@@ -692,11 +690,11 @@ static int madgemc_mcaproc(char *buf, int slot, void *d)
         struct net_local *tp = netdev_priv(dev);
         struct card_info *curcard = tp->tmspriv;
         int len = 0;
+        DECLARE_MAC_BUF(mac);
         
         len += sprintf(buf+len, "-------\n");
         if (curcard) {
                 struct net_local *tp = netdev_priv(dev);
-                int i;
                 
                 len += sprintf(buf+len, "Card Revision: %d\n", curcard->cardrev);
                 len += sprintf(buf+len, "RAM Size: %dkb\n", curcard->ramsize);
@@ -716,11 +714,8 @@ static int madgemc_mcaproc(char *buf, int slot, void *d)
                 }
                 len += sprintf(buf+len, " (%s)\n", (curcard->fairness)?"Unfair":"Fair");
                 
-                len += sprintf(buf+len, "Ring Station Address: ");
-                len += sprintf(buf+len, "%2.2x", dev->dev_addr[0]);
-                for (i = 1; i < 6; i++)
-                        len += sprintf(buf+len, " %2.2x", dev->dev_addr[i]);
-                len += sprintf(buf+len, "\n");
+                len += sprintf(buf+len, "Ring Station Address: %s\n",
+                               print_mac(mac, dev->dev_addr));
         } else 
                 len += sprintf(buf+len, "Card not configured\n");
 
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index a149d5e2965c..74c1f0f189f5 100644
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -418,14 +418,15 @@ static int __devinit olympic_init(struct net_device *dev)
         writel(uaa_addr,olympic_mmio+LAPA);
         adapter_addr=olympic_priv->olympic_lap + (uaa_addr & (~0xf800));
 
+        memcpy_fromio(&dev->dev_addr[0], adapter_addr,6);
+
 #if OLYMPIC_DEBUG
-        printk("adapter address: %02x:%02x:%02x:%02x:%02x:%02x\n",
-                        readb(adapter_addr), readb(adapter_addr+1),readb(adapter_addr+2),
-                        readb(adapter_addr+3),readb(adapter_addr+4),readb(adapter_addr+5));
+ {
+        DECLARE_MAC_BUF(mac);
+        printk("adapter address: %s\n", print_mac(mac, dev->dev_addr));
+ }
 #endif
 
-        memcpy_fromio(&dev->dev_addr[0], adapter_addr,6);
-
         olympic_priv->olympic_addr_table_addr = swab16(readw(init_srb + 12)); 
         olympic_priv->olympic_parms_addr = swab16(readw(init_srb + 14)); 
 
@@ -440,6 +441,7 @@ static int olympic_open(struct net_device *dev)
         unsigned long flags, t;
         int i, open_finished = 1 ;
         u8 resp, err;
+        DECLARE_MAC_BUF(mac);
 
         DECLARE_WAITQUEUE(wait,current) ; 
 
@@ -567,14 +569,8 @@ static int olympic_open(struct net_device *dev)
                         goto out;
 
                 case 0x32:
-                        printk(KERN_WARNING "%s: Invalid LAA: %02x:%02x:%02x:%02x:%02x:%02x\n",
-                                dev->name, 
-                                olympic_priv->olympic_laa[0],
-                                olympic_priv->olympic_laa[1],
-                                olympic_priv->olympic_laa[2],
-                                olympic_priv->olympic_laa[3],
-                                olympic_priv->olympic_laa[4],
-                                olympic_priv->olympic_laa[5]) ; 
+                        printk(KERN_WARNING "%s: Invalid LAA: %s\n",
+                               dev->name, print_mac(mac, olympic_priv->olympic_laa));
                         goto out;
 
                 default:
@@ -704,30 +700,26 @@ static int olympic_open(struct net_device *dev)
 #endif
 
         if (olympic_priv->olympic_network_monitor) { 
-                u8 __iomem *oat ; 
-                u8 __iomem *opt ; 
-                oat = (olympic_priv->olympic_lap + olympic_priv->olympic_addr_table_addr) ; 
-                opt = (olympic_priv->olympic_lap + olympic_priv->olympic_parms_addr) ; 
-
-                printk("%s: Node Address: %02x:%02x:%02x:%02x:%02x:%02x\n",dev->name, 
-                        readb(oat+offsetof(struct olympic_adapter_addr_table,node_addr)), 
-                        readb(oat+offsetof(struct olympic_adapter_addr_table,node_addr)+1),
-                        readb(oat+offsetof(struct olympic_adapter_addr_table,node_addr)+2),
-                        readb(oat+offsetof(struct olympic_adapter_addr_table,node_addr)+3),
-                        readb(oat+offsetof(struct olympic_adapter_addr_table,node_addr)+4),
-                        readb(oat+offsetof(struct olympic_adapter_addr_table,node_addr)+5));
+                u8 __iomem *oat;
+                u8 __iomem *opt;
+                int i;
+                u8 addr[6];
+                DECLARE_MAC_BUF(mac);
+                oat = (olympic_priv->olympic_lap + olympic_priv->olympic_addr_table_addr);
+                opt = (olympic_priv->olympic_lap + olympic_priv->olympic_parms_addr);
+
+                for (i = 0; i < 6; i++)
+                        addr[i] = readb(oat+offsetof(struct olympic_adapter_addr_table,node_addr)+i);
+                printk("%s: Node Address: %s\n",dev->name, print_mac(mac, addr));
                 printk("%s: Functional Address: %02x:%02x:%02x:%02x\n",dev->name, 
                         readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)), 
                         readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)+1),
                         readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)+2),
                         readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)+3));
-                printk("%s: NAUN Address: %02x:%02x:%02x:%02x:%02x:%02x\n",dev->name, 
-                        readb(opt+offsetof(struct olympic_parameters_table, up_node_addr)),
-                        readb(opt+offsetof(struct olympic_parameters_table, up_node_addr)+1),
-                        readb(opt+offsetof(struct olympic_parameters_table, up_node_addr)+2),
-                        readb(opt+offsetof(struct olympic_parameters_table, up_node_addr)+3),
-                        readb(opt+offsetof(struct olympic_parameters_table, up_node_addr)+4),
-                        readb(opt+offsetof(struct olympic_parameters_table, up_node_addr)+5));
+
+                for (i = 0; i < 6; i++)
+                        addr[i] = readb(opt+offsetof(struct olympic_parameters_table, up_node_addr)+i);
+                printk("%s: NAUN Address: %s\n",dev->name, print_mac(mac, addr));
         }
         
         netif_start_queue(dev);
@@ -1445,11 +1437,14 @@ static void olympic_arb_cmd(struct net_device *dev)
                 mac_frame->protocol = tr_type_trans(mac_frame, dev);
 
                 if (olympic_priv->olympic_network_monitor) { 
-                        struct trh_hdr *mac_hdr ; 
-                        printk(KERN_WARNING "%s: Received MAC Frame, details: \n",dev->name) ;
+                        struct trh_hdr *mac_hdr;
+                        DECLARE_MAC_BUF(mac);
+                        printk(KERN_WARNING "%s: Received MAC Frame, details: \n",dev->name);
                         mac_hdr = tr_hdr(mac_frame);
-                        printk(KERN_WARNING "%s: MAC Frame Dest. Addr: %02x:%02x:%02x:%02x:%02x:%02x \n", dev->name , mac_hdr->daddr[0], mac_hdr->daddr[1], mac_hdr->daddr[2], mac_hdr->daddr[3], mac_hdr->daddr[4], mac_hdr->daddr[5]) ; 
-                        printk(KERN_WARNING "%s: MAC Frame Srce. Addr: %02x:%02x:%02x:%02x:%02x:%02x \n", dev->name , mac_hdr->saddr[0], mac_hdr->saddr[1], mac_hdr->saddr[2], mac_hdr->saddr[3], mac_hdr->saddr[4], mac_hdr->saddr[5]) ; 
+                        printk(KERN_WARNING "%s: MAC Frame Dest. Addr: %s\n",
+                               dev->name, print_mac(mac, mac_hdr->daddr));
+                        printk(KERN_WARNING "%s: MAC Frame Srce. Addr: %s\n",
+                               dev->name, print_mac(mac, mac_hdr->saddr));
                 }
                 netif_rx(mac_frame);
                 dev->last_rx = jiffies;
@@ -1644,26 +1639,24 @@ static int olympic_proc_info(char *buffer, char **start, off_t offset, int lengt
         int len=0;
         off_t begin=0;
         off_t pos=0;
-        
+        u8 addr[6];
+        u8 addr2[6];
+        int i;
+        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mac2);
+
         size = sprintf(buffer, 
                 "IBM Pit/Pit-Phy/Olympic Chipset Token Ring Adapter %s\n",dev->name);
         size += sprintf(buffer+size, "\n%6s: Adapter Address   : Node Address      : Functional Addr\n",
            dev->name); 
 
-        size += sprintf(buffer+size, "%6s: %02x:%02x:%02x:%02x:%02x:%02x : %02x:%02x:%02x:%02x:%02x:%02x : %02x:%02x:%02x:%02x\n",
+        for (i = 0 ; i < 6 ; i++)
+                addr[i] = readb(oat+offsetof(struct olympic_adapter_addr_table,node_addr) + i);
+
+        size += sprintf(buffer+size, "%6s: %s : %s : %02x:%02x:%02x:%02x\n",
            dev->name,
-           dev->dev_addr[0],
-           dev->dev_addr[1],
-           dev->dev_addr[2],
-           dev->dev_addr[3],
-           dev->dev_addr[4],
-           dev->dev_addr[5],
-           readb(oat+offsetof(struct olympic_adapter_addr_table,node_addr)), 
-           readb(oat+offsetof(struct olympic_adapter_addr_table,node_addr)+1),
-           readb(oat+offsetof(struct olympic_adapter_addr_table,node_addr)+2),
-           readb(oat+offsetof(struct olympic_adapter_addr_table,node_addr)+3),
-           readb(oat+offsetof(struct olympic_adapter_addr_table,node_addr)+4),
-           readb(oat+offsetof(struct olympic_adapter_addr_table,node_addr)+5),
+           print_mac(mac, dev->dev_addr),
+           print_mac(mac2, addr),
            readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)), 
            readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)+1),
            readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)+2),
@@ -1673,25 +1666,20 @@ static int olympic_proc_info(char *buffer, char **start, off_t offset, int lengt
 
         size += sprintf(buffer+size, "%6s: Physical Addr : Up Node Address   : Poll Address      : AccPri : Auth Src : Att Code :\n",
           dev->name) ; 
-           
-        size += sprintf(buffer+size, "%6s: %02x:%02x:%02x:%02x   : %02x:%02x:%02x:%02x:%02x:%02x : %02x:%02x:%02x:%02x:%02x:%02x : %04x   : %04x     :  %04x    :\n",
+
+        for (i = 0 ; i < 6 ; i++)
+                addr[i] = readb(opt+offsetof(struct olympic_parameters_table, up_node_addr) + i);
+        for (i = 0 ; i < 6 ; i++)
+                addr2[i] =  readb(opt+offsetof(struct olympic_parameters_table, poll_addr) + i);
+
+        size += sprintf(buffer+size, "%6s: %02x:%02x:%02x:%02x   : %s : %s : %04x   : %04x     :  %04x    :\n",
           dev->name,
           readb(opt+offsetof(struct olympic_parameters_table, phys_addr)),
           readb(opt+offsetof(struct olympic_parameters_table, phys_addr)+1),
           readb(opt+offsetof(struct olympic_parameters_table, phys_addr)+2),
           readb(opt+offsetof(struct olympic_parameters_table, phys_addr)+3),
-          readb(opt+offsetof(struct olympic_parameters_table, up_node_addr)),
-          readb(opt+offsetof(struct olympic_parameters_table, up_node_addr)+1),
-          readb(opt+offsetof(struct olympic_parameters_table, up_node_addr)+2),
-          readb(opt+offsetof(struct olympic_parameters_table, up_node_addr)+3),
-          readb(opt+offsetof(struct olympic_parameters_table, up_node_addr)+4),
-          readb(opt+offsetof(struct olympic_parameters_table, up_node_addr)+5),
-          readb(opt+offsetof(struct olympic_parameters_table, poll_addr)),
-          readb(opt+offsetof(struct olympic_parameters_table, poll_addr)+1),
-          readb(opt+offsetof(struct olympic_parameters_table, poll_addr)+2),
-          readb(opt+offsetof(struct olympic_parameters_table, poll_addr)+3),
-          readb(opt+offsetof(struct olympic_parameters_table, poll_addr)+4),
-          readb(opt+offsetof(struct olympic_parameters_table, poll_addr)+5),
+          print_mac(mac, addr),
+          print_mac(mac2, addr2),
           swab16(readw(opt+offsetof(struct olympic_parameters_table, acc_priority))),
           swab16(readw(opt+offsetof(struct olympic_parameters_table, auth_source_class))),
           swab16(readw(opt+offsetof(struct olympic_parameters_table, att_code))));
@@ -1699,14 +1687,11 @@ static int olympic_proc_info(char *buffer, char **start, off_t offset, int lengt
         size += sprintf(buffer+size, "%6s: Source Address    : Bcn T : Maj. V : Lan St : Lcl Rg : Mon Err : Frame Correl : \n",
           dev->name) ; 
         
-        size += sprintf(buffer+size, "%6s: %02x:%02x:%02x:%02x:%02x:%02x : %04x  : %04x   : %04x   : %04x   : %04x    :     %04x     : \n",
+        for (i = 0 ; i < 6 ; i++)
+                addr[i] = readb(opt+offsetof(struct olympic_parameters_table, source_addr) + i);
+        size += sprintf(buffer+size, "%6s: %s : %04x  : %04x   : %04x   : %04x   : %04x    :     %04x     : \n",
           dev->name,
-          readb(opt+offsetof(struct olympic_parameters_table, source_addr)),
-          readb(opt+offsetof(struct olympic_parameters_table, source_addr)+1),
-          readb(opt+offsetof(struct olympic_parameters_table, source_addr)+2),
-          readb(opt+offsetof(struct olympic_parameters_table, source_addr)+3),
-          readb(opt+offsetof(struct olympic_parameters_table, source_addr)+4),
-          readb(opt+offsetof(struct olympic_parameters_table, source_addr)+5),
+          print_mac(mac, addr),
           swab16(readw(opt+offsetof(struct olympic_parameters_table, beacon_type))),
           swab16(readw(opt+offsetof(struct olympic_parameters_table, major_vector))),
           swab16(readw(opt+offsetof(struct olympic_parameters_table, lan_status))),
@@ -1717,16 +1702,13 @@ static int olympic_proc_info(char *buffer, char **start, off_t offset, int lengt
         size += sprintf(buffer+size, "%6s: Beacon Details :  Tx  :  Rx  : NAUN Node Address : NAUN Node Phys : \n",
           dev->name) ; 
 
-        size += sprintf(buffer+size, "%6s:                :  %02x  :  %02x  : %02x:%02x:%02x:%02x:%02x:%02x : %02x:%02x:%02x:%02x    : \n",
+        for (i = 0 ; i < 6 ; i++)
+                addr[i] = readb(opt+offsetof(struct olympic_parameters_table, beacon_naun) + i);
+        size += sprintf(buffer+size, "%6s:                :  %02x  :  %02x  : %s : %02x:%02x:%02x:%02x    : \n",
           dev->name,
           swab16(readw(opt+offsetof(struct olympic_parameters_table, beacon_transmit))),
           swab16(readw(opt+offsetof(struct olympic_parameters_table, beacon_receive))),
-          readb(opt+offsetof(struct olympic_parameters_table, beacon_naun)),
-          readb(opt+offsetof(struct olympic_parameters_table, beacon_naun)+1),
-          readb(opt+offsetof(struct olympic_parameters_table, beacon_naun)+2),
-          readb(opt+offsetof(struct olympic_parameters_table, beacon_naun)+3),
-          readb(opt+offsetof(struct olympic_parameters_table, beacon_naun)+4),
-          readb(opt+offsetof(struct olympic_parameters_table, beacon_naun)+5),
+          print_mac(mac, addr),
           readb(opt+offsetof(struct olympic_parameters_table, beacon_phys)),
           readb(opt+offsetof(struct olympic_parameters_table, beacon_phys)+1),
           readb(opt+offsetof(struct olympic_parameters_table, beacon_phys)+2),
diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
index 85d156dea033..ca6b65919b3d 100644
--- a/drivers/net/tokenring/proteon.c
+++ b/drivers/net/tokenring/proteon.c
@@ -122,6 +122,7 @@ static int __init setup_card(struct net_device *dev, struct device *pdev)
         static int versionprinted;
         const unsigned *port;
         int j,err = 0;
+        DECLARE_MAC_BUF(mac);
 
         if (!dev)
                 return -ENOMEM;
@@ -152,11 +153,8 @@ static int __init setup_card(struct net_device *dev, struct device *pdev)
                 
         proteon_read_eeprom(dev);
 
-        printk(KERN_DEBUG "proteon.c:    Ring Station Address: ");
-        printk("%2.2x", dev->dev_addr[0]);
-        for (j = 1; j < 6; j++)
-                printk(":%2.2x", dev->dev_addr[j]);
-        printk("\n");
+        printk(KERN_DEBUG "proteon.c:    Ring Station Address: %s\n",
+               print_mac(mac, dev->dev_addr));
                 
         tp = netdev_priv(dev);
         tp->setnselout = proteon_setnselout_pins;
diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
index ecbddc80a2a5..32e8d5a9f958 100644
--- a/drivers/net/tokenring/skisa.c
+++ b/drivers/net/tokenring/skisa.c
@@ -139,6 +139,7 @@ static int __init setup_card(struct net_device *dev, struct device *pdev)
         static int versionprinted;
         const unsigned *port;
         int j, err = 0;
+        DECLARE_MAC_BUF(mac);
 
         if (!dev)
                 return -ENOMEM;
@@ -169,11 +170,8 @@ static int __init setup_card(struct net_device *dev, struct device *pdev)
                 
         sk_isa_read_eeprom(dev);
 
-        printk(KERN_DEBUG "skisa.c:    Ring Station Address: ");
-        printk("%2.2x", dev->dev_addr[0]);
-        for (j = 1; j < 6; j++)
-                printk(":%2.2x", dev->dev_addr[j]);
-        printk("\n");
+        printk(KERN_DEBUG "skisa.c:    Ring Station Address: %s\n",
+               print_mac(mac, dev->dev_addr));
                 
         tp = netdev_priv(dev);
         tp->setnselout = sk_isa_setnselout_pins;
diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
index ecdd8511a67b..1c18f782f522 100644
--- a/drivers/net/tokenring/tmspci.c
+++ b/drivers/net/tokenring/tmspci.c
@@ -96,10 +96,11 @@ static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
         static int versionprinted;
         struct net_device *dev;
         struct net_local *tp;
-        int i, ret;
+        int ret;
         unsigned int pci_irq_line;
         unsigned long pci_ioaddr;
         struct card_info *cardinfo = &card_info_table[ent->driver_data];
+        DECLARE_MAC_BUF(mac);
 
         if (versionprinted++ == 0)
                 printk("%s", version);
@@ -136,11 +137,8 @@ static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
                 
         tms_pci_read_eeprom(dev);
 
-        printk("%s:    Ring Station Address: ", dev->name);
-        printk("%2.2x", dev->dev_addr[0]);
-        for (i = 1; i < 6; i++)
-                printk(":%2.2x", dev->dev_addr[i]);
-        printk("\n");
+        printk("%s:    Ring Station Address: %s\n",
+               dev->name, print_mac(mac, dev->dev_addr));
                 
         ret = tmsdev_init(dev, &pdev->dev);
         if (ret) {
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c
index fe3225df0d32..df10af7df7b8 100644
--- a/drivers/net/tsi108_eth.c
+++ b/drivers/net/tsi108_eth.c
@@ -1540,6 +1540,7 @@ tsi108_init_one(struct platform_device *pdev)
         struct tsi108_prv_data *data = NULL;
         hw_info *einfo;
         int err = 0;
+        DECLARE_MAC_BUF(mac);
 
         einfo = pdev->dev.platform_data;
 
@@ -1628,10 +1629,8 @@ tsi108_init_one(struct platform_device *pdev)
                 goto register_fail;
         }
 
-        printk(KERN_INFO "%s: Tsi108 Gigabit Ethernet, MAC: "
-               "%02x:%02x:%02x:%02x:%02x:%02x\n", dev->name,
-               dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-               dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+        printk(KERN_INFO "%s: Tsi108 Gigabit Ethernet, MAC: %s\n"
+               dev->name, print_mac(mac, dev->dev_addr));
 #ifdef DEBUG
         data->msg_enable = DEBUG;
         dump_eth_one(dev);
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index ba3d0e5574a4..f12e33a17363 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -1929,6 +1929,7 @@ static int __devinit de_init_one (struct pci_dev *pdev,
         void __iomem *regs;
         unsigned long pciaddr;
         static int board_idx = -1;
+        DECLARE_MAC_BUF(mac);
 
         board_idx++;
 
@@ -2042,15 +2043,11 @@ static int __devinit de_init_one (struct pci_dev *pdev,
                 goto err_out_iomap;
 
         /* print info about board and interface just registered */
-        printk (KERN_INFO "%s: %s at 0x%lx, "
-                "%02x:%02x:%02x:%02x:%02x:%02x, "
-                "IRQ %d\n",
+        printk (KERN_INFO "%s: %s at 0x%lx, %s, IRQ %d\n",
                 dev->name,
                 de->de21040 ? "21040" : "21041",
                 dev->base_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],
+                print_mac(mac, dev->dev_addr),
                 dev->irq);
 
         pci_set_drvdata(pdev, dev);
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index ee4215ca63f0..4633cc6dd412 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -1088,6 +1088,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
     struct de4x5_private *lp = netdev_priv(dev);
     struct pci_dev *pdev = NULL;
     int i, status=0;
+    DECLARE_MAC_BUF(mac);
 
     gendev->driver_data = dev;
 
@@ -1123,12 +1124,8 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
     dev->base_addr = iobase;
     printk ("%s: %s at 0x%04lx", gendev->bus_id, name, iobase);
 
-    printk(", h/w address ");
     status = get_hw_addr(dev);
-    for (i = 0; i < ETH_ALEN - 1; i++) {     /* get the ethernet addr. */
-        printk("%2.2x:", dev->dev_addr[i]);
-    }
-    printk("%2.2x,\n", dev->dev_addr[i]);
+    printk(", h/w address %s\n", print_mac(mac, dev->dev_addr));
 
     if (status != 0) {
         printk("      which has an Ethernet PROM CRC error.\n");
@@ -5468,19 +5465,16 @@ static void
 de4x5_dbg_srom(struct de4x5_srom *p)
 {
     int i;
+    DECLARE_MAC_BUF(mac);
 
     if (de4x5_debug & DEBUG_SROM) {
         printk("Sub-system Vendor ID: %04x\n", *((u_short *)p->sub_vendor_id));
         printk("Sub-system ID:        %04x\n", *((u_short *)p->sub_system_id));
         printk("ID Block CRC:         %02x\n", (u_char)(p->id_block_crc));
         printk("SROM version:         %02x\n", (u_char)(p->version));
-        printk("# controllers:         %02x\n", (u_char)(p->num_controllers));
+        printk("# controllers:        %02x\n", (u_char)(p->num_controllers));
 
-        printk("Hardware Address:     ");
-        for (i=0;i<ETH_ALEN-1;i++) {
-            printk("%02x:", (u_char)*(p->ieee_addr+i));
-        }
-        printk("%02x\n", (u_char)*(p->ieee_addr+i));
+        printk("Hardware Address:     %s\n", print_mac(mac, p->ieee_addr));
         printk("CRC checksum:         %04x\n", (u_short)(p->chksum));
         for (i=0; i<64; i++) {
             printk("%3d %04x\n", i<<1, (u_short)*((u_short *)p+i));
@@ -5494,21 +5488,12 @@ static void
 de4x5_dbg_rx(struct sk_buff *skb, int len)
 {
     int i, j;
+    DECLARE_MAC_BUF(mac);
+    DECLARE_MAC_BUF(mac2);
 
     if (de4x5_debug & DEBUG_RX) {
-        printk("R: %02x:%02x:%02x:%02x:%02x:%02x <- %02x:%02x:%02x:%02x:%02x:%02x len/SAP:%02x%02x [%d]\n",
-               (u_char)skb->data[0],
-               (u_char)skb->data[1],
-               (u_char)skb->data[2],
-               (u_char)skb->data[3],
-               (u_char)skb->data[4],
-               (u_char)skb->data[5],
-               (u_char)skb->data[6],
-               (u_char)skb->data[7],
-               (u_char)skb->data[8],
-               (u_char)skb->data[9],
-               (u_char)skb->data[10],
-               (u_char)skb->data[11],
+        printk("R: %s <- %s len/SAP:%02x%02x [%d]\n",
+               print_mac(mac, skb->data), print_mac(mac2, &skb->data[6]),
                (u_char)skb->data[12],
                (u_char)skb->data[13],
                len);
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index e2596e9ab1d7..ca90566d5bcd 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -362,6 +362,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
         struct net_device *dev;
         u32 pci_pmr;
         int i, err;
+        DECLARE_MAC_BUF(mac);
 
         DMFE_DBUG(0, "dmfe_init_one()", 0);
 
@@ -470,13 +471,13 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
         if (err)
                 goto err_out_res;
 
-        printk(KERN_INFO "%s: Davicom DM%04lx at pci%s,",
-                dev->name,
-                ent->driver_data >> 16,
-                pci_name(pdev));
-        for (i = 0; i < 6; i++)
-                printk("%c%02x", i ? ':' : ' ', dev->dev_addr[i]);
-        printk(", irq %d.\n", dev->irq);
+        printk(KERN_INFO "%s: Davicom DM%04lx at pci%s, "
+               "%s, irq %d.\n",
+               dev->name,
+               ent->driver_data >> 16,
+               pci_name(pdev),
+               print_mac(mac, dev->dev_addr),
+               dev->irq);
 
         pci_set_master(pdev);
 
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 66977aaa7176..80fee2292531 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1051,12 +1051,11 @@ static void set_rx_mode(struct net_device *dev)
                                 filterbit &= 0x3f;
                                 mc_filter[filterbit >> 5] |= 1 << (filterbit & 31);
                                 if (tulip_debug > 2) {
-                                        printk(KERN_INFO "%s: Added filter for %2.2x:%2.2x:%2.2x:"
-                                                   "%2.2x:%2.2x:%2.2x  %8.8x bit %d.\n", dev->name,
-                                                   mclist->dmi_addr[0], mclist->dmi_addr[1],
-                                                   mclist->dmi_addr[2], mclist->dmi_addr[3],
-                                                   mclist->dmi_addr[4], mclist->dmi_addr[5],
-                                                   ether_crc(ETH_ALEN, mclist->dmi_addr), filterbit);
+                                        DECLARE_MAC_BUF(mac);
+                                        printk(KERN_INFO "%s: Added filter for %s"
+                                               "  %8.8x bit %d.\n",
+                                               dev->name, print_mac(mac, mclist->dmi_addr),
+                                               ether_crc(ETH_ALEN, mclist->dmi_addr), filterbit);
                                 }
                         }
                         if (mc_filter[0] == tp->mc_filter[0]  &&
@@ -1256,6 +1255,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
         const char *chip_name = tulip_tbl[chip_idx].chip_name;
         unsigned int eeprom_missing = 0;
         unsigned int force_csr0 = 0;
+        DECLARE_MAC_BUF(mac);
 
 #ifndef MODULE
         static int did_version;         /* Already printed version info. */
@@ -1639,8 +1639,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
 
         if (eeprom_missing)
                 printk(" EEPROM not present,");
-        for (i = 0; i < 6; i++)
-                printk("%c%2.2X", i ? ':' : ' ', dev->dev_addr[i]);
+        printk(" %s", print_mac(mac, dev->dev_addr));
         printk(", IRQ %d.\n", irq);
 
         if (tp->chip_id == PNIC2)
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 2b7257d97c32..a4fd782bcd27 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -258,6 +258,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
         struct uli526x_board_info *db;  /* board information structure */
         struct net_device *dev;
         int i, err;
+        DECLARE_MAC_BUF(mac);
 
         ULI526X_DBUG(0, "uli526x_init_one()", 0);
 
@@ -372,11 +373,9 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
         if (err)
                 goto err_out_res;
 
-        printk(KERN_INFO "%s: ULi M%04lx at pci%s,",dev->name,ent->driver_data >> 16,pci_name(pdev));
-
-        for (i = 0; i < 6; i++)
-                printk("%c%02x", i ? ':' : ' ', dev->dev_addr[i]);
-        printk(", irq %d.\n", dev->irq);
+        printk(KERN_INFO "%s: ULi M%04lx at pci%s, %s, irq %d.\n",
+               dev->name,ent->driver_data >> 16,pci_name(pdev),
+               print_mac(mac, dev->dev_addr), dev->irq);
 
         pci_set_master(pdev);
 
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index e00833fadc0b..3c40dd6e1a2f 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -354,6 +354,7 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,
         int irq;
         int i, option = find_cnt < MAX_UNITS ? options[find_cnt] : 0;
         void __iomem *ioaddr;
+        DECLARE_MAC_BUF(mac);
 
         i = pci_enable_device(pdev);
         if (i) return i;
@@ -433,11 +434,9 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,
         if (i)
                 goto err_out_cleardev;
 
-        printk(KERN_INFO "%s: %s at %p, ",
-                   dev->name, pci_id_tbl[chip_idx].name, ioaddr);
-        for (i = 0; i < 5; i++)
-                        printk("%2.2x:", dev->dev_addr[i]);
-        printk("%2.2x, IRQ %d.\n", dev->dev_addr[i], irq);
+        printk(KERN_INFO "%s: %s at %p, %s, IRQ %d.\n",
+               dev->name, pci_id_tbl[chip_idx].name, ioaddr,
+               print_mac(mac, dev->dev_addr), irq);
 
         if (np->drv_flags & CanHaveMII) {
                 int phy, phy_idx = 0;
@@ -1245,16 +1244,16 @@ static int netdev_rx(struct net_device *dev)
                         }
 #ifndef final_version                           /* Remove after testing. */
                         /* You will want this info for the initial debug. */
-                        if (debug > 5)
-                                printk(KERN_DEBUG "  Rx data %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:"
-                                           "%2.2x %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x %2.2x%2.2x "
-                                           "%d.%d.%d.%d.\n",
-                                           skb->data[0], skb->data[1], skb->data[2], skb->data[3],
-                                           skb->data[4], skb->data[5], skb->data[6], skb->data[7],
-                                           skb->data[8], skb->data[9], skb->data[10],
-                                           skb->data[11], skb->data[12], skb->data[13],
-                                           skb->data[14], skb->data[15], skb->data[16],
-                                           skb->data[17]);
+                        if (debug > 5) {
+                                DECLARE_MAC_BUF(mac);
+                                DECLARE_MAC_BUF(mac2);
+
+                                printk(KERN_DEBUG "  Rx data %s %s"
+                                       " %2.2x%2.2x %d.%d.%d.%d.\n",
+                                       print_mac(mac, &skb->data[0]), print_mac(mac2, &skb->data[6]),
+                                       skb->data[12], skb->data[13],
+                                       skb->data[14], skb->data[15], skb->data[16], skb->data[17]);
+                        }
 #endif
                         skb->protocol = eth_type_trans(skb, dev);
                         netif_rx(skb);
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index de8c92083e92..70befe33e454 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -1074,6 +1074,7 @@ static void read_mac_address(struct xircom_private *card)
         unsigned char j, tuple, link, data_id, data_count;
         unsigned long flags;
         int i;
+        DECLARE_MAC_BUF(mac);
 
         enter("read_mac_address");
 
@@ -1103,11 +1104,7 @@ static void read_mac_address(struct xircom_private *card)
                 }
         }
         spin_unlock_irqrestore(&card->lock, flags);
-#ifdef DEBUG
-        for (i = 0; i < 6; i++)
-                printk("%c%2.2X", i ? ':' : ' ', card->dev->dev_addr[i]);
-        printk("\n");
-#endif
+        pr_debug(" %s\n", print_mac(mac, card->dev->dev_addr));
         leave("read_mac_address");
 }
 
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index d8b8e68ef70b..1f7644695976 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -159,16 +159,15 @@ tun_net_mclist(struct net_device *dev)
         struct tun_struct *tun = netdev_priv(dev);
         const struct dev_mc_list *mclist;
         int i;
+        DECLARE_MAC_BUF(mac);
         DBG(KERN_DEBUG "%s: tun_net_mclist: mc_count %d\n",
                         dev->name, dev->mc_count);
         memset(tun->chr_filter, 0, sizeof tun->chr_filter);
         for (i = 0, mclist = dev->mc_list; i < dev->mc_count && mclist != NULL;
                         i++, mclist = mclist->next) {
                 add_multi(tun->net_filter, mclist->dmi_addr);
-                DBG(KERN_DEBUG "%s: tun_net_mclist: %x:%x:%x:%x:%x:%x\n",
-                                dev->name,
-                                mclist->dmi_addr[0], mclist->dmi_addr[1], mclist->dmi_addr[2],
-                                mclist->dmi_addr[3], mclist->dmi_addr[4], mclist->dmi_addr[5]);
+                DBG(KERN_DEBUG "%s: tun_net_mclist: %s\n",
+                    dev->name, print_mac(mac, mclist->dmi_addr));
         }
 }
 
@@ -358,6 +357,7 @@ static ssize_t tun_chr_aio_read(struct kiocb *iocb, const struct iovec *iv,
         DECLARE_WAITQUEUE(wait, current);
         struct sk_buff *skb;
         ssize_t len, ret = 0;
+        DECLARE_MAC_BUF(mac);
 
         if (!tun)
                 return -EBADFD;
@@ -412,16 +412,14 @@ static ssize_t tun_chr_aio_read(struct kiocb *iocb, const struct iovec *iv,
                                   (addr[0] == 0x33 && addr[1] == 0x33)) &&
                                  ((tun->if_flags & IFF_ALLMULTI) ||
                                   (tun->chr_filter[bit_nr >> 5] & (1 << (bit_nr & 31)))))) {
-                        DBG(KERN_DEBUG "%s: tun_chr_readv: accepted: %x:%x:%x:%x:%x:%x\n",
-                                        tun->dev->name, addr[0], addr[1], addr[2],
-                                        addr[3], addr[4], addr[5]);
+                        DBG(KERN_DEBUG "%s: tun_chr_readv: accepted: %s\n",
+                                        tun->dev->name, print_mac(mac, addr));
                         ret = tun_put_user(tun, skb, (struct iovec *) iv, len);
                         kfree_skb(skb);
                         break;
                 } else {
-                        DBG(KERN_DEBUG "%s: tun_chr_readv: rejected: %x:%x:%x:%x:%x:%x\n",
-                                        tun->dev->name, addr[0], addr[1], addr[2],
-                                        addr[3], addr[4], addr[5]);
+                        DBG(KERN_DEBUG "%s: tun_chr_readv: rejected: %s\n",
+                                        tun->dev->name, print_mac(mac, addr));
                         kfree_skb(skb);
                         continue;
                 }
@@ -564,6 +562,7 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
         struct tun_struct *tun = file->private_data;
         void __user* argp = (void __user*)arg;
         struct ifreq ifr;
+        DECLARE_MAC_BUF(mac);
 
         if (cmd == TUNSETIFF || _IOC_TYPE(cmd) == 0x89)
                 if (copy_from_user(&ifr, argp, sizeof ifr))
@@ -692,22 +691,16 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
                 /** Add the specified group to the character device's multicast filter
                  * list. */
                 add_multi(tun->chr_filter, ifr.ifr_hwaddr.sa_data);
-                DBG(KERN_DEBUG "%s: add multi: %x:%x:%x:%x:%x:%x\n",
-                                tun->dev->name,
-                                (u8)ifr.ifr_hwaddr.sa_data[0], (u8)ifr.ifr_hwaddr.sa_data[1],
-                                (u8)ifr.ifr_hwaddr.sa_data[2], (u8)ifr.ifr_hwaddr.sa_data[3],
-                                (u8)ifr.ifr_hwaddr.sa_data[4], (u8)ifr.ifr_hwaddr.sa_data[5]);
+                DBG(KERN_DEBUG "%s: add multi: %s\n",
+                    tun->dev->name, print_mac(mac, ifr.ifr_hwaddr.sa_data));
                 return 0;
 
         case SIOCDELMULTI:
                 /** Remove the specified group from the character device's multicast
                  * filter list. */
                 del_multi(tun->chr_filter, ifr.ifr_hwaddr.sa_data);
-                DBG(KERN_DEBUG "%s: del multi: %x:%x:%x:%x:%x:%x\n",
-                                tun->dev->name,
-                                (u8)ifr.ifr_hwaddr.sa_data[0], (u8)ifr.ifr_hwaddr.sa_data[1],
-                                (u8)ifr.ifr_hwaddr.sa_data[2], (u8)ifr.ifr_hwaddr.sa_data[3],
-                                (u8)ifr.ifr_hwaddr.sa_data[4], (u8)ifr.ifr_hwaddr.sa_data[5]);
+                DBG(KERN_DEBUG "%s: del multi: %s\n",
+                    tun->dev->name, print_mac(mac, ifr.ifr_hwaddr.sa_data));
                 return 0;
 
         default:
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index c6d8513ecad6..43894e95fcb3 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -2316,8 +2316,8 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         dma_addr_t shared_dma;
         struct cmd_desc xp_cmd;
         struct resp_desc xp_resp[3];
-        int i;
         int err = 0;
+        DECLARE_MAC_BUF(mac);
 
         if(!did_version++)
                 printk(KERN_INFO "%s", version);
@@ -2532,13 +2532,11 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         pci_set_drvdata(pdev, dev);
 
-        printk(KERN_INFO "%s: %s at %s 0x%llx, ",
+        printk(KERN_INFO "%s: %s at %s 0x%llx, %s\n",
                dev->name, typhoon_card_info[card_id].name,
                use_mmio ? "MMIO" : "IO",
-               (unsigned long long)pci_resource_start(pdev, use_mmio));
-        for(i = 0; i < 5; i++)
-                printk("%2.2x:", dev->dev_addr[i]);
-        printk("%2.2x\n", dev->dev_addr[i]);
+               (unsigned long long)pci_resource_start(pdev, use_mmio),
+               print_mac(mac, dev->dev_addr));
 
         /* xp_resp still contains the response to the READ_VERSIONS command.
          * For debugging, let the user know what version he has.
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 432a2f054468..d1ed68a11e70 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -1297,6 +1297,7 @@ static int pegasus_probe(struct usb_interface *intf,
         pegasus_t *pegasus;
         int dev_index = id - pegasus_ids;
         int res = -ENOMEM;
+        DECLARE_MAC_BUF(mac);
 
         usb_get_dev(dev);
         net = alloc_etherdev(sizeof(struct pegasus));
@@ -1367,12 +1368,10 @@ static int pegasus_probe(struct usb_interface *intf,
         queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check,
                                 CARRIER_CHECK_DELAY);
 
-        dev_info(&intf->dev, "%s, %s, %02x:%02x:%02x:%02x:%02x:%02x\n",
-                net->name,
-                usb_dev_id[dev_index].name,
-                net->dev_addr [0], net->dev_addr [1],
-                net->dev_addr [2], net->dev_addr [3],
-                net->dev_addr [4], net->dev_addr [5]);
+        dev_info(&intf->dev, "%s, %s, %s\n",
+                 net->name,
+                 usb_dev_id[dev_index].name,
+                 print_mac(mac, net->dev_addr));
         return 0;
 
 out3:
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 3542ca5fb0fa..acd5f1c0e63a 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1134,6 +1134,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
         struct usb_device               *xdev;
         int                             status;
         const char                      *name;
+        DECLARE_MAC_BUF(mac);
 
         name = udev->dev.driver->name;
         info = (struct driver_info *) prod->driver_info;
@@ -1241,14 +1242,11 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
         if (status)
                 goto out3;
         if (netif_msg_probe (dev))
-                devinfo (dev, "register '%s' at usb-%s-%s, %s, "
-                                "%02x:%02x:%02x:%02x:%02x:%02x",
+                devinfo (dev, "register '%s' at usb-%s-%s, %s, %s",
                         udev->dev.driver->name,
                         xdev->bus->bus_name, xdev->devpath,
                         dev->driver_info->description,
-                        net->dev_addr [0], net->dev_addr [1],
-                        net->dev_addr [2], net->dev_addr [3],
-                        net->dev_addr [4], net->dev_addr [5]);
+                        print_mac(mac, net->dev_addr));
 
         // ok, it's ready to go.
         usb_set_intfdata (udev, dev);
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index d55c4fdff489..9669bce0fd07 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -638,6 +638,7 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
 #else
         int bar = 0;
 #endif
+        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -794,18 +795,14 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
         if (rc)
                 goto err_out_unmap;
 
-        printk(KERN_INFO "%s: VIA %s at 0x%lx, ",
+        printk(KERN_INFO "%s: VIA %s at 0x%lx, %s, IRQ %d.\n",
                dev->name, name,
 #ifdef USE_MMIO
-                memaddr
+               memaddr,
 #else
-                (long)ioaddr
+               (long)ioaddr,
 #endif
-                 );
-
-        for (i = 0; i < 5; i++)
-                printk("%2.2x:", dev->dev_addr[i]);
-        printk("%2.2x, IRQ %d.\n", dev->dev_addr[i], pdev->irq);
+               print_mac(mac, dev->dev_addr), pdev->irq);
 
         pci_set_drvdata(pdev, dev);
 
diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index cef365881ac2..fa14255282af 100644
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
@@ -156,6 +156,7 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
         int word16 = 0;                         /* 0 = 8 bit, 1 = 16 bit */
         const char *model_name;
         static unsigned version_printed;
+        DECLARE_MAC_BUF(mac);
 
         for (i = 0; i < 8; i++)
                 checksum += inb(ioaddr + 8 + i);
@@ -174,9 +175,11 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
         if (ei_debug  &&  version_printed++ == 0)
                 printk(version);
 
-        printk("%s: WD80x3 at %#3x,", dev->name, ioaddr);
         for (i = 0; i < 6; i++)
-                printk(" %2.2X", dev->dev_addr[i] = inb(ioaddr + 8 + i));
+                dev->dev_addr[i] = inb(ioaddr + 8 + i);
+
+        printk("%s: WD80x3 at %#3x, %s",
+               dev->name, ioaddr, print_mac(mac, dev->dev_addr));
 
         /* The following PureData probe code was contributed by
            Mike Jagdis <jaggy@purplet.demon.co.uk>. Puredata does software
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",
-               wiphy_name(dev->wiphy), MAC_ARG(dev->wiphy->perm_addr),
+        printk(KERN_INFO "%s: hwaddr %s, Rev 0x%02x\n",
+               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",
-                dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-                dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5] );
+        airo_print_info(dev->name, "MAC enabled %s",
+                        print_mac(mac, dev->dev_addr));
 
         /* 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",
-                        dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-                        dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+        airo_print_info(dev->name, "MAC enabled %s",
+                        print_mac(mac, dev->dev_addr));
         /* 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",
-                               (int)APList_rid.ap[i][0],
-                               (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]);
+                ptr += sprintf(ptr, "%s\n",
+                               print_mac(mac, APList_rid.ap[i]));
         }
         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",
-                                (int)BSSList_rid.bssid[0],
-                                (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],
+                ptr += sprintf(ptr, "%s %*s rssi = %d",
+                               print_mac(mac, BSSList_rid.bssid),
                                 (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,
-                                                                                 dmi->dmi_addr[0], dmi->dmi_addr[1], dmi->dmi_addr[2],
-                                                                                 dmi->dmi_addr[3], dmi->dmi_addr[4], dmi->dmi_addr[5]);
+                                                                printk(KERN_ERR "%s mcl %s\n",
+                                                                       dev->name, print_mac(mac, dmi->dmi_addr));
                                                         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,
-                                        (unsigned char) skbtmp[0], (unsigned char) skbtmp[1], (unsigned char) skbtmp[2], (unsigned char) skbtmp[3],
-                                        (unsigned char) skbtmp[4], (unsigned char) skbtmp[5], (unsigned char) skbtmp[6], (unsigned char) skbtmp[7],
-                                        (unsigned char) skbtmp[8], (unsigned char) skbtmp[9], (unsigned char) skbtmp[10], (unsigned char) skbtmp[11],
-                                        immedDestAddress[0], immedDestAddress[1], immedDestAddress[2],
-                                        immedDestAddress[3], immedDestAddress[4], immedDestAddress[5],
-                                        immedSrcAddress[0], immedSrcAddress[1], immedSrcAddress[2],
-                                        immedSrcAddress[3], immedSrcAddress[4], immedSrcAddress[5]);
+                                printk(KERN_WARNING "%s t %s f %s imd %s ims %s\n",
+                                       dev->name, print_mac(mac, skbtmp),
+                                       print_mac(mac2, &skbtmp[6]),
+                                       print_mac(mac3, immedDestAddress),
+                                       print_mac(mac4, immedSrcAddress));
                         }
                         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",
-               dev->name, DRIVER_MAJOR, DRIVER_MINOR,
-               dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-               dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5] );
+        printk(KERN_INFO "%s: Atmel at76c50x. Version %d.%d. MAC %s\n",
+               dev->name, DRIVER_MAJOR, DRIVER_MINOR, print_mac(mac, dev->dev_addr));
 
         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,
-               MAC2STR(hdr->addr1), MAC2STR(hdr->addr2), MAC2STR(hdr->addr3));
+        printk(KERN_DEBUG "   A1=%s", print_mac(mac, hdr->addr1));
+        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",
-                       local->dev->name, MAC2STR(hdr->addr2));
+                       "from unknown TA=%s\n",
+                       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",
-                               local->dev->name, MAC2STR(hdr->addr2));
+                               "received packet from %s\n",
+                               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",
-                       local->dev->name, MAC2STR(hdr->addr2), keyidx);
+                       " (SA=%s keyidx=%d)\n",
+                       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",
-                               local->dev->name, MAC2STR(hdr->addr2));
+                               " (SA=%s)\n",
+                               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,
-                               MAC2STR(hdr->addr2));
+                               "from %s\n", dev->name,
+                               print_mac(mac, hdr->addr2));
                         /* TODO: could inform hostapd about this so that it
                          * could send auth failure report */
                         goto rx_dropped;
@@ -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",
-                               local->dev->name, MAC2STR(hdr->addr2));
+                               "frame not encrypted (SA=%s)\n",
+                               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",
-                               dev->name, MAC2STR(hdr->addr2));
+                               "frame from %s"
+                               " (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,
-               MAC2STR(hdr->addr1), MAC2STR(hdr->addr2), MAC2STR(hdr->addr3));
+        printk(KERN_DEBUG "   A1=%s", print_mac(mac, hdr->addr1));
+        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",
-                               local->dev->name, MAC2STR(hdr->addr1));
+                               "TX packet to %s\n",
+                               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",
-                       MAC2STR(sta->addr));
+                printk("AP: could not remove STA %s"
+                       " 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",
-                               local->dev->name, MAC2STR(sta->addr));
+                               "connection to AP %s\n",
+                               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 "
-                               "removed, but it has 'perm' flag\n",
-                               local->dev->name, MAC2STR(sta->addr));
+                        PDEBUG(DEBUG_AP, "%s: STA %s"
+                               " would have been removed, "
+                               "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 "
-                       "status=%d - %s\n",
-                       dev->name, MAC2STR(hdr->addr1), auth_alg,
+                PDEBUG(DEBUG_AP, "%s: %s auth_cb - alg=%d "
+                       "trans#=%d status=%d - %s\n",
+                       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",
-                       dev->name, MAC2STR(hdr->addr1), txt);
+                PDEBUG(DEBUG_AP, "%s: %s assoc_cb - %s\n",
+                       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 "
-                       "poll frame\n", ap->local->dev->name,
-                       MAC2STR(hdr->addr1));
+                PDEBUG(DEBUG_AP, "%s: STA %s"
+                       " did not ACK activity poll frame\n",
+                       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,
-                       MAC2STR(hdr->addr2));
+                       "(len=%d) from %s\n", dev->name, len,
+                       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",
-                               dev->name, MAC2STR(sta->addr));
+                               " assuming AP %s is now STA\n",
+                               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 "
-                       "stat=%d len=%d fc=%04x) ==> %d (%s)\n",
-                       dev->name, MAC2STR(hdr->addr2), auth_alg,
+                PDEBUG(DEBUG_AP, "%s: %s auth (alg=%d "
+                       "trans#=%d stat=%d len=%d fc=%04x) ==> %d (%s)\n",
+                       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",
-                       dev->name, len, reassoc, MAC2STR(hdr->addr2));
+                       "(len=%d, reassoc=%d) from %s\n",
+                       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"
-                               " data (%d bytes) [",
-                               dev->name, MAC2STR(hdr->addr2), left);
+                        PDEBUG(DEBUG_AP, "%s: assoc from %s"
+                               " with extra data (%d bytes) [",
+                               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
-               ") => %d(%d) (%s)\n",
-               dev->name, MAC2STR(hdr->addr2), reassoc ? "re" : "", len,
-               MAC2STR(prev_ap), resp, send_deauth, txt);
+        PDEBUG(DEBUG_AP, "%s: %s %sassoc (len=%d "
+               "prev_ap=%s) => %d(%d) (%s)\n",
+               dev->name, print_mac(mac, hdr->addr2), reassoc ? "re" : "", len,
+               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, "
-               "reason_code=%d\n", dev->name, MAC2STR(hdr->addr2), len,
+        PDEBUG(DEBUG_AP, "%s: deauthentication: %s len=%d, "
+               "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, "
-               "reason_code=%d\n", dev->name, MAC2STR(hdr->addr2), len,
+        PDEBUG(DEBUG_AP, "%s: disassociation: %s len=%d, "
+               "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
-               " PWRMGT=%d\n",
-               MAC2STR(hdr->addr1), MAC2STR(hdr->addr2),
+        PDEBUG(DEBUG_PS2, "handle_pspoll: BSSID=%s"
+               ", TA=%s PWRMGT=%d\n",
+               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
-                       " not own MAC\n", MAC2STR(hdr->addr1));
+                PDEBUG(DEBUG_AP, "handle_pspoll - addr1(BSSID)=%s"
+                       " 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",
-                               MAC2STR(hdr->addr1));
+                               "%s not own MAC\n",
+                               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
-                       " not own MAC\n", MAC2STR(hdr->addr1));
+                PDEBUG(DEBUG_AP, "handle_ap_item - addr1(DA)=%s"
+                       " 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
-                       " not own MAC\n", MAC2STR(hdr->addr3));
+                PDEBUG(DEBUG_AP, "handle_ap_item - addr3(BSSID)=%s"
+                       " 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 "
-               "STA " MACSTR "\n", local->dev->name, MAC2STR(sta->addr));
+        PDEBUG(DEBUG_PS2, "%s: Scheduling buffered packet delivery for STA "
+               "%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"
-                               " %d\n", dev->name, MAC2STR(sta->addr),
-                               sta->tx_rate);
+                        PDEBUG(DEBUG_AP, "%s: STA %s"
+                               " TX rate raised to %d\n",
+                               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 "
-                       "mode buffer\n", local->dev->name, MAC2STR(sta->addr));
+                PDEBUG(DEBUG_PS, "%s: No more space in STA (%s"
+                       ")'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 "
-                       "TX error (@%lu)\n",
-                       local->dev->name, MAC2STR(hdr->addr1), jiffies);
+                PDEBUG(DEBUG_AP, "%s: Could not find STA %s"
+                       " for this TX error (@%lu)\n",
+                       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 "
-                               "to %d\n", local->dev->name, MAC2STR(sta->addr),
+                        PDEBUG(DEBUG_AP, "%s: STA %s"
+                               " 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",
-                               dev->name, MAC2STR(hdr->addr2));
+                               "%s\n",
+                               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, "
-                               "subtype=0x%02x)\n", dev->name,
-                               MAC2STR(hdr->addr2), type >> 2, stype >> 4);
+                               "%s with no ToDS flag "
+                               "(type=0x%02x, subtype=0x%02x)\n", dev->name,
+                               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="
-               MACSTR " A4=" MACSTR "\n",
-               MAC2STR(txdesc.addr1), MAC2STR(txdesc.addr2),
-               MAC2STR(txdesc.addr3), MAC2STR(txdesc.addr4));
+        PDEBUG(DEBUG_EXTRA, "   A1=%s A2=%s A3=%s A4=%s\n",
+               print_mac(mac, txdesc.addr1), print_mac(mac2, txdesc.addr2),
+               print_mac(mac3, txdesc.addr3), print_mac(mac4, 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",
-                       dev->name, MAC2STR(local->preferred_ap));
+                PDEBUG(DEBUG_EXTRA, "%s: Preferred AP BSSID "
+                       "%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",
-               dev->name, MAC2STR(req.bssid), le16_to_cpu(req.channel));
+        PDEBUG(DEBUG_EXTRA, "%s: JoinRequest: BSSID=%s"
+               " 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",
-               dev->name, MAC2STR(local->preferred_ap));
+        printk(KERN_DEBUG "%s: Trying to join BSSID %s\n",
+               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",
-               local->dev->name, MAC2STR(param->sta_addr));
+        DECLARE_MAC_BUF(mac);
+        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="
-               MACSTR "\n",
-               MAC2STR(rx->addr1), MAC2STR(rx->addr2), MAC2STR(rx->addr3),
-               MAC2STR(rx->addr4));
+        printk(KERN_DEBUG "   A1=%s A2=%s A3=%s A4=%s\n",
+               print_mac(mac, rx->addr1), print_mac(mac2, rx->addr2),
+               print_mac(mac3, rx->addr3), print_mac(mac4, rx->addr4));
 
-        printk(KERN_DEBUG "   dst=" MACSTR " src=" MACSTR " len=%d\n",
-               MAC2STR(rx->dst_addr), MAC2STR(rx->src_addr),
+        printk(KERN_DEBUG "   dst=%s src=%s len=%d\n",
+               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="
-               MACSTR "\n",
-               MAC2STR(tx->addr1), MAC2STR(tx->addr2), MAC2STR(tx->addr3),
-               MAC2STR(tx->addr4));
+        printk(KERN_DEBUG "   A1=%s A2=%s A3=%s A4=%s\n",
+               print_mac(mac, tx->addr1), print_mac(mac2, tx->addr2),
+               print_mac(mac3, tx->addr3), print_mac(mac4, tx->addr4));
 
-        printk(KERN_DEBUG "   dst=" MACSTR " src=" MACSTR " len=%d\n",
-               MAC2STR(tx->dst_addr), MAC2STR(tx->src_addr),
+        printk(KERN_DEBUG "   dst=%s src=%s len=%d\n",
+               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",
-                             MAC2STR(bss->bssid), bss->last_update,
+                p += sprintf(p, "%s\t%lu\t%u\t0x%x\t",
+                             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",
-                       bssid[0], bssid[1], bssid[2],
-                       bssid[3], bssid[4], bssid[5]);
+        out += sprintf(out, "BSSID:   %s\n", print_mac(mac, bssid));
         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",
-                             bssid[0], bssid[1], bssid[2], bssid[3], bssid[4],
-                             bssid[5]);
+                IPW_DEBUG_HC("MANDATORY_BSSID: %s\n",
+                             print_mac(mac, bssid));
         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",
-                     wrqu->ap_addr.sa_data[0] & 0xff,
-                     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);
+        IPW_DEBUG_WX("SET BSSID -> %s\n",
+                     print_mac(mac, wrqu->ap_addr.sa_data));
 
       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",
-                     MAC_ARG(wrqu->ap_addr.sa_data));
+        IPW_DEBUG_WX("Getting WAP BSSID: %s\n",
+                     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",
-                       priv->net_dev->name, MAC_ARG(mac));
+        IPW_DEBUG_INFO("%s: Setting MAC to %s\n",
+                       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 "
-                                "because of the same BSSID match: " MAC_FMT
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
+                                "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 "
-                                "'%s (" MAC_FMT ")' has a stronger signal.\n",
-                                escaped, MAC_ARG(network->bssid),
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded because "
+                                "'%s (%s)' has a stronger signal.\n",
+                                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 "
-                                "because of BSSID mismatch: " MAC_FMT ".\n",
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
+                                "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",
-                               MAC_ARG(priv->bssid));
+                IPW_DEBUG_INFO("BSSID locked to %s\n",
+                               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 ", "
-                                                               MAC_FMT ", "
-                                                               MAC_FMT "\n",
-                                                               MAC_ARG(header->
+                                                               "%s, "
+                                                               "%s, "
+                                                               "%s\n",
+                                                               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",
-                     MAC_ARG(wrqu->ap_addr.sa_data));
+        IPW_DEBUG_WX("Setting mandatory BSSID to %s\n",
+                     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",
-                     MAC_ARG(wrqu->ap_addr.sa_data));
+        IPW_DEBUG_WX("Getting WAP BSSID: %s\n",
+                     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",
-                                            MAC_ARG(hdr->addr1));
+                                            "invalid cell: %s\n",
+                                            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",
-               priv->net_dev->name, MAC_ARG(priv->mac_addr));
+        printk(KERN_INFO "%s: Setting MAC to %s\n",
+               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",
-                                        MAC_ARG(hdr->addr1));
+                        IWL_DEBUG_RATE("LQ: ADD station %s\n",
+                                       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
-                                             ", " MAC_FMT ", " MAC_FMT "\n",
-                                             MAC_ARG(header->addr1),
-                                             MAC_ARG(header->addr2),
-                                             MAC_ARG(header->addr3));
+                                            ("Dropping (non network): %s"
+                                             ", %s, %s\n",
+                                             print_mac(mac1, header->addr1),
+                                             print_mac(mac2, header->addr2),
+                                             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 ", "
-                                       MAC_FMT ", " MAC_FMT "\n",
-                                       MAC_ARG(header->addr1),
-                                       MAC_ARG(header->addr2),
-                                       MAC_ARG(header->addr3));
+                        IWL_DEBUG_DROP("Dropping (dup): %s, %s, %s\n",
+                                       print_mac(mac1, header->addr1),
+                                       print_mac(mac2, header->addr2),
+                                       print_mac(mac3, 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",
-                       MAC_ARG(addr), priv->num_stations);
+        IWL_DEBUG_INFO("can not find STA %s (total %d)\n",
+                       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",
-                                        MAC_ARG(hdr->addr1));
+                        IWL_DEBUG_RATE("LQ: ADD station %s\n",
+                                       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",
-                             MAC_ARG(sta->addr));
+                IWL_DEBUG_HT("LQ: ADD station %s\n",
+                             print_mac(mac, sta->addr));
 
                 if (sta_id == IWL_INVALID_STATION) {
-                        IWL_DEBUG_RATE("LQ: ADD station " MAC_FMT "\n",
-                                        MAC_ARG(sta->addr));
-                                        sta_id = iwl_add_station(priv,
+                        IWL_DEBUG_RATE("LQ: ADD station %s\n",
+                                       print_mac(mac, sta->addr));
+                        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",
-                        MAC_ARG(addr), priv->num_stations);
+        IWL_DEBUG_ASSOC("can not find STA %s total %d\n",
+                        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 ", "
-                                               MAC_FMT "\n",
-                                               MAC_ARG(header->addr1),
-                                               MAC_ARG(header->addr2),
-                                               MAC_ARG(header->addr3));
+                                               "%s, %s, %s\n",
+                                               print_mac(mac1, header->addr1),
+                                               print_mac(mac2, header->addr2),
+                                               print_mac(mac3, 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 ", "
-                                       MAC_FMT "\n",
-                                       MAC_ARG(header->addr1),
-                                       MAC_ARG(header->addr2),
-                                       MAC_ARG(header->addr3));
+                                       "%s, %s, %s\n",
+                                       print_mac(mac1, header->addr1),
+                                       print_mac(mac2, header->addr2),
+                                       print_mac(mac3, header->addr3));
                 else if (unlikely(is_duplicate_packet(priv, header)))
-                        IWL_DEBUG_DROP("Dropping (dup): " MAC_FMT ", "
-                                       MAC_FMT ", " MAC_FMT "\n",
-                                       MAC_ARG(header->addr1),
-                                       MAC_ARG(header->addr2),
-                                       MAC_ARG(header->addr3));
+                        IWL_DEBUG_DROP("Dropping (dup): %s, %s, %s\n",
+                                       print_mac(mac1, header->addr1),
+                                       print_mac(mac2, header->addr2),
+                                       print_mac(mac3, 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
-                    " tid=%d\n", MAC_ARG(da), tid);
+        IWL_WARNING("iwl-AGG iwl_mac_ht_tx_agg_start on da=%s"
+                    " 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",
-                    MAC_ARG(da), tid);
+        IWL_DEBUG_INFO("iwl_mac_ht_tx_agg_stop on da=%s tid=%d\n",
+                       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
-                    " tid=%d\n", MAC_ARG(da), tid);
+        IWL_WARNING("iwl-AGG iwl_mac_ht_rx_agg_start on da=%s"
+                    " 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",
-                     MAC_ARG(da), tid);
+        IWL_WARNING("iwl-AGG iwl_mac_ht_rx_agg_stop on da=%s tid=%d\n",
+                    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",
-                               MAC_ARG(hdr->addr1));
+                DECLARE_MAC_BUF(mac);
+
+                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",
-                        MAC_ARG(rxon->node_addr));
-        IWL_DEBUG_RADIO("u8[6] bssid_addr: " MAC_FMT "\n",
-                        MAC_ARG(rxon->bssid_addr));
+        IWL_DEBUG_RADIO("u8[6] node_addr: %s\n",
+                        print_mac(mac, rxon->node_addr));
+        IWL_DEBUG_RADIO("u8[6] bssid_addr: %s\n",
+                        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",
-                               MAC_ARG(priv->mac_addr));
+                IWL_DEBUG_INFO("MAC address: %s\n",
+                               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",
-                        priv->assoc_id, MAC_ARG(priv->active_rxon.bssid_addr));
+        IWL_DEBUG_ASSOC("Associated as %d to: %s\n",
+                        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",
-                                   MAC_ARG(conf->mac_addr));
+                IWL_DEBUG_MAC80211("enter: MAC %s\n",
+                                   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",
-                                   MAC_ARG(conf->bssid));
+                IWL_DEBUG_MAC80211("bssid: %s\n",
+                                   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",
-                                           MAC_ARG(conf->bssid));
+                        IWL_DEBUG_MAC80211("bssid was set to: %s\n",
+                                           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",
-                                   MAC_ARG(addr));
+                DECLARE_MAC_BUF(mac);
+
+                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",
-                               MAC_ARG(hdr->addr1));
+                DECLARE_MAC_BUF(mac);
+
+                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",
-                        MAC_ARG(rxon->node_addr));
-        IWL_DEBUG_RADIO("u8[6] bssid_addr: " MAC_FMT "\n",
-                        MAC_ARG(rxon->bssid_addr));
+        IWL_DEBUG_RADIO("u8[6] node_addr: %s\n",
+                        print_mac(mac, rxon->node_addr));
+        IWL_DEBUG_RADIO("u8[6] bssid_addr: %s\n",
+                        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",
-                               MAC_ARG(priv->mac_addr));
+                IWL_DEBUG_INFO("MAC address: %s\n",
+                               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",
-                        priv->assoc_id, MAC_ARG(priv->active_rxon.bssid_addr));
+        IWL_DEBUG_ASSOC("Associated as %d to: %s\n",
+                        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",
-                                   MAC_ARG(conf->mac_addr));
+                IWL_DEBUG_MAC80211("enter: MAC %s\n",
+                                   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",
-                                   MAC_ARG(conf->bssid));
+                IWL_DEBUG_MAC80211("bssid: %s\n",
+                                   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",
-                                           MAC_ARG(conf->bssid));
+                        IWL_DEBUG_MAC80211("bssid was set to: %s\n",
+                                           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",
-                                   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/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,
-                MAC_ARG(assoc_req->bssid));
+        lbs_deb_enter_args(LBS_DEB_ASSOC, "BSSID %s",
+                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, "
-                        "cannot associate.\n", MAC_ARG(assoc_req->bssid));
+                lbs_deb_assoc("ASSOC: WAP: BSSID %s not found, "
+                        "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",
-               MAC_ARG(hwspec->permanentaddr));
+        lbs_deb_cmd("GET_HW_SPEC: MAC addr %s\n",
+                    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",
-                     MAC_ARG(bssid), pauthenticate->authtype);
+        lbs_deb_join("AUTH_CMD: BSSID is : %s auth=0x%X\n",
+                     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",
-               MAC_ARG(join_cmd->bss.bssid), join_cmd->bss.ssid);
+               "ADHOC_J_CMD: BSSID = %s, SSID = '%s'\n",
+               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",
-               MAC_ARG(padhocresult->bssid));
+        lbs_deb_join("ADHOC_RESP: BSSID = %s\n",
+                     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:"
-                                               MAC_FMT "\n", i,
-                                               adapter->multicastlist[i][0],
-                                               adapter->multicastlist[i][1],
-                                               adapter->multicastlist[i][2],
-                                               adapter->multicastlist[i][3],
-                                               adapter->multicastlist[i][4],
-                                               adapter->multicastlist[i][5]);
+                                        lbs_deb_net("Multicast address %d:%s\n",
+                                               i, print_mac(mac,
+                                               adapter->multicastlist[i]));
                                 }
                                 /* 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",
-                       i++, MAC_ARG(iter_bss->bssid), (s32) iter_bss->rssi,
+                lbs_deb_scan("Scan:(%02d) %s, RSSI[%03d], SSID[%s]\n",
+                       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",
-                       new.bssid[0], new.bssid[1], new.bssid[2],
-                       new.bssid[3], new.bssid[4], new.bssid[5]);
+                lbs_deb_scan("SCAN_RESP: BSSID = %s\n",
+                             print_mac(mac, new.bssid));
 
                 /* 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 "
-           "%c%c, hw_addr ", dev->name, dev->base_addr, dev->irq,
-           (u_long) ramBase, (int) readb(ramBase+NETWAVE_EREG_NI),
-           (int) readb(ramBase+NETWAVE_EREG_NI+1));
-    for (i = 0; i < 6; i++)
-        printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : "\n"));
+    printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx"
+           "id %c%c, hw_addr %s\n",
+           dev->name, dev->base_addr, dev->irq,
+           (u_long) ramBase,
+           (int) readb(ramBase+NETWAVE_EREG_NI),
+           (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",
-               dev->name, dev->dev_addr[0], dev->dev_addr[1],
-               dev->dev_addr[2], dev->dev_addr[3], dev->dev_addr[4],
-               dev->dev_addr[5]);
+        printk(KERN_DEBUG "%s: MAC address %s\n",
+               dev->name, print_mac(mac, dev->dev_addr));
 
         /* 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
-                       "\n", MAC2STR(bssid));
+                printk(KERN_DEBUG "Failed to add BSS WPA entry for "
+                       "%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",
-                                mlmeex->address[0],
-                                mlmeex->address[1],
-                                mlmeex->address[2],
-                                mlmeex->address[3],
-                                mlmeex->address[4],
-                                mlmeex->address[5]
-                                );
+                printk(KERN_DEBUG "Authenticate from: address:\t%s\n",
+                       print_mac(mac, mlmeex->address));
                 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 "
-                                        "address:\t%02x:%02x:%02x:%02x:%02x:%02x\n",
-                                mlmeex->address[0],
-                                mlmeex->address[1],
-                                mlmeex->address[2],
-                                mlmeex->address[3],
-                                mlmeex->address[4],
-                                mlmeex->address[5]
-                                );
+                        printk(KERN_DEBUG "No WPA IE found from address:\t%s\n",
+                               print_mac(mac, mlmeex->address));
                         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 "
-                                        "address:\t%02x:%02x:%02x:%02x:%02x:%02x\n",
-                                mlmeex->address[0],
-                                mlmeex->address[1],
-                                mlmeex->address[2],
-                                mlmeex->address[3],
-                                mlmeex->address[4],
-                                mlmeex->address[5]
-                                );
+                        printk(KERN_DEBUG "No WPA IE found from address:\t%s\n",
+                               print_mac(mac, mlmeex->address));
                         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 ",
-       dev->name, dev->irq);
-    for (i = 0; i < 6; i++)
-    printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : "\n"));
+    printk(KERN_INFO "%s: RayLink, irq %d, hw_addr %s\n",
+       dev->name, dev->irq, print_mac(mac, dev->dev_addr));
 
     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, 
-                   "BSSID                = %02x:%02x:%02x:%02x:%02x:%02x\n",
-                   p[0],p[1],p[2],p[3],p[4],p[5]);
+    len += sprintf(buf + len, "BSSID                = %s\n",
+                   print_mac(mac, p));
 
     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",
-               wiphy_name(dev->wiphy), MAC_ARG(dev->wiphy->perm_addr),
+        printk(KERN_INFO "%s: hwaddr %s, rtl8187 V%d + %s\n",
+               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
-               "psa_unused0[]: %02X:%02X:%02X:%02X:%02X:%02X:%02X\n",
-               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]);
+        printk(KERN_DEBUG "psa_unused0[]: %s\n",
+               print_mac(mac, p->psa_unused0));
 #endif                          /* DEBUG_SHOW_UNUSED */
-        printk(KERN_DEBUG
-               "psa_univ_mac_addr[]: %02x:%02x:%02x:%02x:%02x:%02x\n",
-               p->psa_univ_mac_addr[0], p->psa_univ_mac_addr[1],
-               p->psa_univ_mac_addr[2], 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_mac_addr[]: %s\n",
+               print_mac(mac, p->psa_univ_mac_addr));
+        printk(KERN_DEBUG "psa_local_mac_addr[]: %s\n",
+               print_mac(mac, p->psa_local_mac_addr));
         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",
-               msg1, msg2, p[0], p[1], p[2], p[3], p[4], p[5], length);
+               "%s: %s(): dest %s, length %d\n",
+               msg1, msg2, print_mac(mac, p), length);
         printk(KERN_DEBUG
-               "%s: %s(): src %02X:%02X:%02X:%02X:%02X:%02X, type 0x%02X%02X\n",
-               msg1, msg2, p[6], p[7], p[8], p[9], p[10], p[11], p[12],
-               p[13]);
+               "%s: %s(): src %s, type 0x%02X%02X\n",
+               msg1, msg2, print_mac(mac, &p[6]), p[12], 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);
-        for (i = 0; i < WAVELAN_ADDR_SIZE; i++)
-                printk("%s%02X", (i == 0) ? " " : ":", dev->dev_addr[i]);
-        printk(", IRQ %d", dev->irq);
+        printk(KERN_NOTICE "%s: WaveLAN at %#x, %s, IRQ %d",
+               dev->name, ioaddr, print_mac(mac, dev->dev_addr), 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
-                               " %02x:%02x:%02x:%02x:%02x:%02x\n",
-                               dmi->dmi_addr[0], dmi->dmi_addr[1],
-                               dmi->dmi_addr[2], dmi->dmi_addr[3],
-                               dmi->dmi_addr[4], dmi->dmi_addr[5]);
+                        printk(KERN_DEBUG " %s\n",
+                               print_mac(mac, dmi->dmi_addr));
+ }
 #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",
-         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]);
+  printk(KERN_DEBUG "psa_unused0[]: %s\n",
+         print_mac(mac, p->psa_unused0));
 #endif  /* DEBUG_SHOW_UNUSED */
-  printk(KERN_DEBUG "psa_univ_mac_addr[]: %02x:%02x:%02x:%02x:%02x:%02x\n",
-         p->psa_univ_mac_addr[0],
-         p->psa_univ_mac_addr[1],
-         p->psa_univ_mac_addr[2],
-         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_mac_addr[]: %s\n",
+         print_mac(mac, p->psa_univ_mac_addr));
+  printk(KERN_DEBUG "psa_local_mac_addr[]: %s\n",
+         print_mac(mac, p->psa_local_mac_addr));
   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",
-         msg1, msg2, p[0], p[1], p[2], p[3], p[4], p[5], length);
-  printk(KERN_DEBUG "%s: %s(): src %02X:%02X:%02X:%02X:%02X:%02X, type 0x%02X%02X\n",
-         msg1, msg2, p[6], p[7], p[8], p[9], p[10], p[11], p[12], p[13]);
+  printk(KERN_DEBUG "%s: %s(): dest %s, length %d\n",
+         msg1, msg2, print_mac(mac, p), length);
+  printk(KERN_DEBUG "%s: %s(): src %s, type 0x%02X%02X\n",
+         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",
-         dev->name, base, dev->irq);
-  for(i = 0; i < WAVELAN_ADDR_SIZE; i++)
-    printk("%s%02X", (i == 0) ? " " : ":", dev->dev_addr[i]);
+  printk(KERN_NOTICE "%s: WaveLAN: port %#lx, irq %d, "
+         "hw_addr %s",
+         dev->name, base, dev->irq,
+         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",
-               dmi->dmi_addr[0], dmi->dmi_addr[1], dmi->dmi_addr[2],
-               dmi->dmi_addr[3], dmi->dmi_addr[4], dmi->dmi_addr[5] );
+        printk(KERN_DEBUG " %s\n",
+               print_mac(mac, dmi->dmi_addr));
 #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: "
-               "%02X %02X %02X %02X %02X %02X\n", dev->name,
-               this->bssid[0], this->bssid[1], this->bssid[2],
-               this->bssid[3], this->bssid[4], this->bssid[5]);
+        printk(KERN_INFO "%s: Wireless LAN online. BSSID: %s\n",
+               dev->name, print_mac(mac, this->bssid));
         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 */
-        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++) {
+        for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = ((char *)&this->mac_addr)[i];
-                printk("%c%02x", i ? ':' : ' ', dev->dev_addr[i]);
-        }
-        printk("\n");
+
+        /* print probe information */
+        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",
-                                  MAC_ARG(mc->dmi_addr));
+                        dev_dbg_f(zd_mac_dev(mac), "mc addr %s\n",
+                                  print_mac(mac2, mc->dmi_addr));
                         zd_mc_add_addr(&hash, mc->dmi_addr);
                 }
         }
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index 709623e1c611..87f002ade531 100644
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -374,6 +374,7 @@ static int __devinit yellowfin_init_one(struct pci_dev *pdev,
 #else
         int bar = 1;
 #endif
+        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -480,12 +481,10 @@ static int __devinit yellowfin_init_one(struct pci_dev *pdev,
         if (i)
                 goto err_out_unmap_status;
 
-        printk(KERN_INFO "%s: %s type %8x at %p, ",
+        printk(KERN_INFO "%s: %s type %8x at %p, %s, IRQ %d.\n",
                    dev->name, pci_id_tbl[chip_idx].name,
-                   ioread32(ioaddr + ChipRev), ioaddr);
-        for (i = 0; i < 5; i++)
-                        printk("%2.2x:", dev->dev_addr[i]);
-        printk("%2.2x, IRQ %d.\n", dev->dev_addr[i], irq);
+                   ioread32(ioaddr + ChipRev), ioaddr,
+                   print_mac(mac, dev->dev_addr), irq);
 
         if (np->drv_flags & HasMII) {
                 int phy, phy_idx = 0;
@@ -1101,11 +1100,11 @@ static int yellowfin_rx(struct net_device *dev)
                         memcmp(le32_to_cpu(yp->rx_ring_dma +
                                 entry*sizeof(struct yellowfin_desc)),
                                 "\377\377\377\377\377\377", 6) != 0) {
-                        if (bogus_rx++ == 0)
-                                printk(KERN_WARNING "%s: Bad frame to %2.2x:%2.2x:%2.2x:%2.2x:"
-                                           "%2.2x:%2.2x.\n",
-                                           dev->name, buf_addr[0], buf_addr[1], buf_addr[2],
-                                           buf_addr[3], buf_addr[4], buf_addr[5]);
+                        if (bogus_rx++ == 0) {
+                                DECLARE_MAC_BUF(mac);
+                                printk(KERN_WARNING "%s: Bad frame to %s\n",
+                                           dev->name, print_mac(mac, buf_addr));
+                        }
 #endif
                 } else {
                         struct sk_buff *skb;
diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index 43712c7b9ecf..a86c022d6a94 100644
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -370,6 +370,7 @@ static int __init znet_probe (void)
         struct net_device *dev;
         char *p;
         int err = -ENOMEM;
+        DECLARE_MAC_BUF(mac);
 
         /* This code scans the region 0xf0000 to 0xfffff for a "NETIDBLK". */
         for(p = (char *)phys_to_virt(0xf0000); p < (char *)phys_to_virt(0x100000); p++)
@@ -392,14 +393,14 @@ static int __init znet_probe (void)
         dev->base_addr = netinfo->iobase1;
         dev->irq = netinfo->irq1;
 
-        printk(KERN_INFO "%s: ZNET at %#3lx,", dev->name, dev->base_addr);
-
         /* The station address is in the "netidblk" at 0x0f0000. */
         for (i = 0; i < 6; i++)
-                printk(" %2.2x", dev->dev_addr[i] = netinfo->netid[i]);
+                dev->dev_addr[i] = netinfo->netid[i];
 
-        printk(", using IRQ %d DMA %d and %d.\n", dev->irq, netinfo->dma1,
-               netinfo->dma2);
+        printk(KERN_INFO "%s: ZNET at %#3lx, %s"
+               ", using IRQ %d DMA %d and %d.\n",
+               dev->name, dev->base_addr, print_mac(mac, dev->dev_addr),
+               dev->irq, netinfo->dma1, netinfo->dma2);
 
         if (znet_debug > 1) {
                 printk(KERN_INFO "%s: vendor '%16.16s' IRQ1 %d IRQ2 %d DMA1 %d DMA2 %d.\n",
diff --git a/drivers/net/zorro8390.c b/drivers/net/zorro8390.c
index fb215eb6dcf3..3926b2aa9cca 100644
--- a/drivers/net/zorro8390.c
+++ b/drivers/net/zorro8390.c
@@ -151,6 +151,7 @@ static int __devinit zorro8390_init(struct net_device *dev,
         0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e,
         0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e,
     };
+    DECLARE_MAC_BUF(mac);
 
     /* Reset card. Who knows what dain-bramaged state it was left in. */
     {
@@ -211,12 +212,12 @@ static int __devinit zorro8390_init(struct net_device *dev,
     i = request_irq(IRQ_AMIGA_PORTS, __ei_interrupt, IRQF_SHARED, DRV_NAME, dev);
     if (i) return i;
 
-    for(i = 0; i < ETHER_ADDR_LEN; i++) {
+    for(i = 0; i < ETHER_ADDR_LEN; i++)
+        dev->dev_addr[i] = SA_prom[i];
+
 #ifdef DEBUG
-        printk(" %2.2x", SA_prom[i]);
+    printk("%s", print_mac(mac, dev->dev_addr));
 #endif
-        dev->dev_addr[i] = SA_prom[i];
-    }
 
     ei_status.name = name;
     ei_status.tx_start_page = start_page;
@@ -243,10 +244,8 @@ static int __devinit zorro8390_init(struct net_device *dev,
         return err;
     }
 
-    printk(KERN_INFO "%s: %s at 0x%08lx, Ethernet Address "
-           "%02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, name, board,
-           dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-           dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+    printk(KERN_INFO "%s: %s at 0x%08lx, Ethernet Address %s\n",
+           dev->name, name, board, print_mac(mac, dev->dev_addr));
 
     return 0;
 }
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 3213f6f4aa58..0e791e2c0c5a 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -120,6 +120,14 @@ static inline struct ethhdr *eth_hdr(const struct sk_buff *skb)
 #ifdef CONFIG_SYSCTL
 extern struct ctl_table ether_table[];
 #endif
+
+/*
+ *      Display a 6 byte device address (MAC) in a readable format.
+ */
+#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
+extern char *print_mac(char *buf, const u8 *addr);
+#define DECLARE_MAC_BUF(var) char var[18] __maybe_unused
+
 #endif
 
 #endif  /* _LINUX_IF_ETHER_H */
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index bbd85cd61ed5..164d13211165 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -119,11 +119,6 @@ do { if (ieee80211_debug_level & (level)) \
 #define IEEE80211_DEBUG(level, fmt, args...) do {} while (0)
 #endif                          /* CONFIG_IEEE80211_DEBUG */
 
-/* debug macros not dependent on CONFIG_IEEE80211_DEBUG */
-
-#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
-#define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5]
-
 /* escape_essid() is intended to be used in debug (and possibly error)
  * messages. It should never be used for passing essid to user space. */
 const char *escape_essid(const char *essid, u8 essid_len);
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index a2c14f95b9a0..947f3c820e42 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1106,8 +1106,4 @@ static inline int ieee80211_get_morefrag(struct ieee80211_hdr *hdr)
                 IEEE80211_FCTL_MOREFRAGS) != 0;
 }
 
-#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
-#define MAC_ARG(x) ((u8*)(x))[0], ((u8*)(x))[1], ((u8*)(x))[2], \
-                   ((u8*)(x))[3], ((u8*)(x))[4], ((u8*)(x))[5]
-
 #endif /* MAC80211_H */
diff --git a/net/802/tr.c b/net/802/tr.c
index 55c76d77d322..aa3c2e936abc 100644
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -283,8 +283,10 @@ void tr_source_route(struct sk_buff *skb,struct trh_hdr *trh,struct net_device *
                 if(entry)
                 {
 #if TR_SR_DEBUG
-printk("source routing for %02X:%02X:%02X:%02X:%02X:%02X\n",trh->daddr[0],
-                  trh->daddr[1],trh->daddr[2],trh->daddr[3],trh->daddr[4],trh->daddr[5]);
+{
+DECLARE_MAC_BUF(mac);
+printk("source routing for %s\n",print_mac(mac, trh->daddr));
+}
 #endif
                         if(!entry->local_ring && (ntohs(entry->rcf) & TR_RCF_LEN_MASK) >> 8)
                         {
@@ -366,10 +368,9 @@ static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev)
         if(entry==NULL)
         {
 #if TR_SR_DEBUG
-printk("adding rif_entry: addr:%02X:%02X:%02X:%02X:%02X:%02X rcf:%04X\n",
-                trh->saddr[0],trh->saddr[1],trh->saddr[2],
-                trh->saddr[3],trh->saddr[4],trh->saddr[5],
-                ntohs(trh->rcf));
+                DECLARE_MAC_BUF(mac);
+                printk("adding rif_entry: addr:%s rcf:%04X\n",
+                       print_mac(mac, trh->saddr), ntohs(trh->rcf));
 #endif
                 /*
                  *      Allocate our new entry. A failure to allocate loses
@@ -414,10 +415,11 @@ printk("adding rif_entry: addr:%02X:%02X:%02X:%02X:%02X:%02X rcf:%04X\n",
                          !(trh->rcf & htons(TR_RCF_BROADCAST_MASK)))
                     {
 #if TR_SR_DEBUG
-printk("updating rif_entry: addr:%02X:%02X:%02X:%02X:%02X:%02X rcf:%04X\n",
-                trh->saddr[0],trh->saddr[1],trh->saddr[2],
-                trh->saddr[3],trh->saddr[4],trh->saddr[5],
-                ntohs(trh->rcf));
+{
+DECLARE_MAC_BUF(mac);
+printk("updating rif_entry: addr:%s rcf:%04X\n",
+                print_mac(mac, trh->saddr), ntohs(trh->rcf));
+}
 #endif
                             entry->rcf = trh->rcf & htons((unsigned short)~TR_RCF_BROADCAST_MASK);
                             memcpy(&(entry->rseg[0]),&(trh->rseg[0]),8*sizeof(unsigned short));
@@ -528,6 +530,7 @@ static int rif_seq_show(struct seq_file *seq, void *v)
 {
         int j, rcf_len, segment, brdgnmb;
         struct rif_cache *entry = v;
+        DECLARE_MAC_BUF(mac);
 
         if (v == SEQ_START_TOKEN)
                 seq_puts(seq,
@@ -537,10 +540,9 @@ static int rif_seq_show(struct seq_file *seq, void *v)
                 long ttl = (long) (entry->last_used + sysctl_tr_rif_timeout)
                                 - (long) jiffies;
 
-                seq_printf(seq, "%s %02X:%02X:%02X:%02X:%02X:%02X %7li ",
+                seq_printf(seq, "%s %s %7li ",
                            dev?dev->name:"?",
-                           entry->addr[0],entry->addr[1],entry->addr[2],
-                           entry->addr[3],entry->addr[4],entry->addr[5],
+                           print_mac(mac, entry->addr),
                            ttl/HZ);
 
                         if (entry->local_ring)
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
index e9a51a69870e..92cd74973c97 100644
--- a/net/appletalk/aarp.c
+++ b/net/appletalk/aarp.c
@@ -997,6 +997,7 @@ static int aarp_seq_show(struct seq_file *seq, void *v)
         struct aarp_iter_state *iter = seq->private;
         struct aarp_entry *entry = v;
         unsigned long now = jiffies;
+        DECLARE_MAC_BUF(mac);
 
         if (v == SEQ_START_TOKEN)
                 seq_puts(seq,
@@ -1007,13 +1008,7 @@ static int aarp_seq_show(struct seq_file *seq, void *v)
                            ntohs(entry->target_addr.s_net),
                            (unsigned int) entry->target_addr.s_node,
                            entry->dev ? entry->dev->name : "????");
-                seq_printf(seq, "%02X:%02X:%02X:%02X:%02X:%02X",
-                           entry->hwaddr[0] & 0xFF,
-                           entry->hwaddr[1] & 0xFF,
-                           entry->hwaddr[2] & 0xFF,
-                           entry->hwaddr[3] & 0xFF,
-                           entry->hwaddr[4] & 0xFF,
-                           entry->hwaddr[5] & 0xFF);
+                seq_printf(seq, "%s", print_mac(mac, entry->hwaddr));
                 seq_printf(seq, " %8s",
                            dt2str((long)entry->expires_at - (long)now));
                 if (iter->table == unresolved)
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 81eb4f4cbe10..c742d37bfb97 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -709,17 +709,13 @@ static int br2684_seq_show(struct seq_file *seq, void *v)
                         br2684_devs);
         const struct net_device *net_dev = brdev->net_dev;
         const struct br2684_vcc *brvcc;
+        DECLARE_MAC_BUF(mac);
 
-        seq_printf(seq, "dev %.16s: num=%d, mac=%02X:%02X:"
-                       "%02X:%02X:%02X:%02X (%s)\n", net_dev->name,
-                       brdev->number,
-                       net_dev->dev_addr[0],
-                       net_dev->dev_addr[1],
-                       net_dev->dev_addr[2],
-                       net_dev->dev_addr[3],
-                       net_dev->dev_addr[4],
-                       net_dev->dev_addr[5],
-                       brdev->mac_was_set ? "set" : "auto");
+        seq_printf(seq, "dev %.16s: num=%d, mac=%s (%s)\n",
+                   net_dev->name,
+                   brdev->number,
+                   print_mac(mac, net_dev->dev_addr),
+                   brdev->mac_was_set ? "set" : "auto");
 
         list_for_each_entry(brvcc, &brdev->brvccs, brvccs) {
                 seq_printf(seq, "  vcc %d.%d.%d: encaps=%s"
diff --git a/net/atm/lec.c b/net/atm/lec.c
index 813a090dcaf4..c909c76223e1 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -266,6 +266,7 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)
         char buf[300];
         int i = 0;
 #endif /* DUMP_PACKETS >0 */
+        DECLARE_MAC_BUF(mac);
 
         pr_debug("lec_start_xmit called\n");
         if (!priv->lecd) {
@@ -373,19 +374,15 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 if (entry && (entry->tx_wait.qlen < LEC_UNRES_QUE_LEN)) {
                         pr_debug("%s:lec_start_xmit: queuing packet, ",
                                 dev->name);
-                        pr_debug("MAC address 0x%02x:%02x:%02x:%02x:%02x:%02x\n",
-                                lec_h->h_dest[0], lec_h->h_dest[1],
-                                lec_h->h_dest[2], lec_h->h_dest[3],
-                                lec_h->h_dest[4], lec_h->h_dest[5]);
+                        pr_debug("MAC address %s\n",
+                                 print_mac(mac, lec_h->h_dest));
                         skb_queue_tail(&entry->tx_wait, skb);
                 } else {
                         pr_debug
                             ("%s:lec_start_xmit: tx queue full or no arp entry, dropping, ",
                              dev->name);
-                        pr_debug("MAC address 0x%02x:%02x:%02x:%02x:%02x:%02x\n",
-                                lec_h->h_dest[0], lec_h->h_dest[1],
-                                lec_h->h_dest[2], lec_h->h_dest[3],
-                                lec_h->h_dest[4], lec_h->h_dest[5]);
+                        pr_debug("MAC address %s\n",
+                                 print_mac(mac, lec_h->h_dest));
                         priv->stats.tx_dropped++;
                         dev_kfree_skb(skb);
                 }
@@ -397,9 +394,8 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         while (entry && (skb2 = skb_dequeue(&entry->tx_wait))) {
                 pr_debug("lec.c: emptying tx queue, ");
-                pr_debug("MAC address 0x%02x:%02x:%02x:%02x:%02x:%02x\n",
-                        lec_h->h_dest[0], lec_h->h_dest[1], lec_h->h_dest[2],
-                        lec_h->h_dest[3], lec_h->h_dest[4], lec_h->h_dest[5]);
+                pr_debug("MAC address %s\n",
+                         print_mac(mac, lec_h->h_dest));
                 lec_send(vcc, skb2, priv);
         }
 
@@ -453,6 +449,7 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
         struct lec_arp_table *entry;
         int i;
         char *tmp;              /* FIXME */
+        DECLARE_MAC_BUF(mac);
 
         atomic_sub(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
         mesg = (struct atmlec_msg *)skb->data;
@@ -539,13 +536,9 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
                         struct net_bridge_fdb_entry *f;
 
                         pr_debug
-                            ("%s: bridge zeppelin asks about 0x%02x:%02x:%02x:%02x:%02x:%02x\n",
-                             dev->name, mesg->content.proxy.mac_addr[0],
-                             mesg->content.proxy.mac_addr[1],
-                             mesg->content.proxy.mac_addr[2],
-                             mesg->content.proxy.mac_addr[3],
-                             mesg->content.proxy.mac_addr[4],
-                             mesg->content.proxy.mac_addr[5]);
+                            ("%s: bridge zeppelin asks about %s\n",
+                             dev->name,
+                             print_mac(mac, mesg->content.proxy.mac_addr));
 
                         if (br_fdb_get_hook == NULL || dev->br_port == NULL)
                                 break;
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index bb7523a5b408..e13602d8154d 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -534,6 +534,7 @@ out:
 
 void netpoll_print_options(struct netpoll *np)
 {
+        DECLARE_MAC_BUF(mac);
         printk(KERN_INFO "%s: local port %d\n",
                          np->name, np->local_port);
         printk(KERN_INFO "%s: local IP %d.%d.%d.%d\n",
@@ -544,15 +545,8 @@ void netpoll_print_options(struct netpoll *np)
                          np->name, np->remote_port);
         printk(KERN_INFO "%s: remote IP %d.%d.%d.%d\n",
                          np->name, HIPQUAD(np->remote_ip));
-        printk(KERN_INFO "%s: remote ethernet address "
-                         "%02x:%02x:%02x:%02x:%02x:%02x\n",
-                         np->name,
-                         np->remote_mac[0],
-                         np->remote_mac[1],
-                         np->remote_mac[2],
-                         np->remote_mac[3],
-                         np->remote_mac[4],
-                         np->remote_mac[5]);
+        printk(KERN_INFO "%s: remote ethernet address %s\n",
+                         np->name, print_mac(mac, np->remote_mac));
 }
 
 int netpoll_parse_options(struct netpoll *np, char *opt)
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 94e42be16daa..f07bd590f8f9 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -599,11 +599,11 @@ static const struct file_operations pktgen_fops = {
 
 static int pktgen_if_show(struct seq_file *seq, void *v)
 {
-        int i;
         struct pktgen_dev *pkt_dev = seq->private;
         __u64 sa;
         __u64 stopped;
         __u64 now = getCurUs();
+        DECLARE_MAC_BUF(mac);
 
         seq_printf(seq,
                    "Params: count %llu  min_pkt_size: %u  max_pkt_size: %u\n",
@@ -648,19 +648,12 @@ static int pktgen_if_show(struct seq_file *seq, void *v)
 
         seq_puts(seq, "     src_mac: ");
 
-        if (is_zero_ether_addr(pkt_dev->src_mac))
-                for (i = 0; i < 6; i++)
-                        seq_printf(seq, "%02X%s", pkt_dev->odev->dev_addr[i],
-                                   i == 5 ? "  " : ":");
-        else
-                for (i = 0; i < 6; i++)
-                        seq_printf(seq, "%02X%s", pkt_dev->src_mac[i],
-                                   i == 5 ? "  " : ":");
+        seq_printf(seq, "%s ",
+                   print_mac(mac, is_zero_ether_addr(pkt_dev->src_mac) ?
+                             pkt_dev->odev->dev_addr : pkt_dev->src_mac));
 
         seq_printf(seq, "dst_mac: ");
-        for (i = 0; i < 6; i++)
-                seq_printf(seq, "%02X%s", pkt_dev->dst_mac[i],
-                           i == 5 ? "\n" : ":");
+        seq_printf(seq, "%s\n", print_mac(mac, pkt_dev->dst_mac));
 
         seq_printf(seq,
                    "     udp_src_min: %d  udp_src_max: %d  udp_dst_min: %d  udp_dst_max: %d\n",
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 57c592ed0105..2aaf6faf74ac 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -337,3 +337,11 @@ struct net_device *alloc_etherdev_mq(int sizeof_priv, unsigned int queue_count)
         return alloc_netdev_mq(sizeof_priv, "eth%d", ether_setup, queue_count);
 }
 EXPORT_SYMBOL(alloc_etherdev_mq);
+
+char *print_mac(char *buf, const u8 *addr)
+{
+        sprintf(buf, MAC_FMT,
+                addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+        return buf;
+}
+EXPORT_SYMBOL(print_mac);
diff --git a/net/ieee80211/ieee80211_crypt_ccmp.c b/net/ieee80211/ieee80211_crypt_ccmp.c
index 2e6b099fc84c..0936a3e0210b 100644
--- a/net/ieee80211/ieee80211_crypt_ccmp.c
+++ b/net/ieee80211/ieee80211_crypt_ccmp.c
@@ -297,6 +297,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         int i, blocks, last, len;
         size_t data_len = skb->len - hdr_len - CCMP_HDR_LEN - CCMP_MIC_LEN;
         u8 *mic = skb->data + skb->len - CCMP_MIC_LEN;
+        DECLARE_MAC_BUF(mac);
 
         if (skb->len < hdr_len + CCMP_HDR_LEN + CCMP_MIC_LEN) {
                 key->dot11RSNAStatsCCMPFormatErrors++;
@@ -309,7 +310,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         if (!(keyidx & (1 << 5))) {
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG "CCMP: received packet without ExtIV"
-                               " flag from " MAC_FMT "\n", MAC_ARG(hdr->addr2));
+                               " flag from %s\n", print_mac(mac, hdr->addr2));
                 }
                 key->dot11RSNAStatsCCMPFormatErrors++;
                 return -2;
@@ -322,9 +323,9 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         }
         if (!key->key_set) {
                 if (net_ratelimit()) {
-                        printk(KERN_DEBUG "CCMP: received packet from " MAC_FMT
+                        printk(KERN_DEBUG "CCMP: received packet from %s"
                                " with keyid=%d that does not have a configured"
-                               " key\n", MAC_ARG(hdr->addr2), keyidx);
+                               " key\n", print_mac(mac, hdr->addr2), keyidx);
                 }
                 return -3;
         }
@@ -339,11 +340,13 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
 
         if (ccmp_replay_check(pn, key->rx_pn)) {
                 if (net_ratelimit()) {
-                        IEEE80211_DEBUG_DROP("CCMP: replay detected: STA=" MAC_FMT
-                               " previous PN %02x%02x%02x%02x%02x%02x "
-                               "received PN %02x%02x%02x%02x%02x%02x\n",
-                               MAC_ARG(hdr->addr2), MAC_ARG(key->rx_pn),
-                               MAC_ARG(pn));
+                        IEEE80211_DEBUG_DROP("CCMP: replay detected: STA=%s "
+                                 "previous PN %02x%02x%02x%02x%02x%02x "
+                                 "received PN %02x%02x%02x%02x%02x%02x\n",
+                                 print_mac(mac, hdr->addr2),
+                                 key->rx_pn[0], key->rx_pn[1], key->rx_pn[2],
+                                 key->rx_pn[3], key->rx_pn[4], key->rx_pn[5],
+                                 pn[0], pn[1], pn[2], pn[3], pn[4], pn[5]);
                 }
                 key->dot11RSNAStatsCCMPReplays++;
                 return -4;
@@ -371,7 +374,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         if (memcmp(mic, a, CCMP_MIC_LEN) != 0) {
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG "CCMP: decrypt failed: STA="
-                               MAC_FMT "\n", MAC_ARG(hdr->addr2));
+                               "%s\n", print_mac(mac, hdr->addr2));
                 }
                 key->dot11RSNAStatsCCMPDecryptErrors++;
                 return -5;
@@ -443,12 +446,16 @@ static int ieee80211_ccmp_get_key(void *key, int len, u8 * seq, void *priv)
 static char *ieee80211_ccmp_print_stats(char *p, void *priv)
 {
         struct ieee80211_ccmp_data *ccmp = priv;
+
         p += sprintf(p, "key[%d] alg=CCMP key_set=%d "
                      "tx_pn=%02x%02x%02x%02x%02x%02x "
                      "rx_pn=%02x%02x%02x%02x%02x%02x "
                      "format_errors=%d replays=%d decrypt_errors=%d\n",
                      ccmp->key_idx, ccmp->key_set,
-                     MAC_ARG(ccmp->tx_pn), MAC_ARG(ccmp->rx_pn),
+                     ccmp->tx_pn[0], ccmp->tx_pn[1], ccmp->tx_pn[2],
+                     ccmp->tx_pn[3], ccmp->tx_pn[4], ccmp->tx_pn[5],
+                     ccmp->rx_pn[0], ccmp->rx_pn[1], ccmp->rx_pn[2],
+                     ccmp->rx_pn[3], ccmp->rx_pn[4], ccmp->rx_pn[5],
                      ccmp->dot11RSNAStatsCCMPFormatErrors,
                      ccmp->dot11RSNAStatsCCMPReplays,
                      ccmp->dot11RSNAStatsCCMPDecryptErrors);
diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c
index 5a48d8e0aec1..6cc54eeca3ed 100644
--- a/net/ieee80211/ieee80211_crypt_tkip.c
+++ b/net/ieee80211/ieee80211_crypt_tkip.c
@@ -359,14 +359,15 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
         u8 rc4key[16], *pos, *icv;
         u32 crc;
         struct scatterlist sg;
+        DECLARE_MAC_BUF(mac);
 
         if (tkey->flags & IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) {
                 if (net_ratelimit()) {
                         struct ieee80211_hdr_4addr *hdr =
                             (struct ieee80211_hdr_4addr *)skb->data;
                         printk(KERN_DEBUG ": TKIP countermeasures: dropped "
-                               "TX packet to " MAC_FMT "\n",
-                               MAC_ARG(hdr->addr1));
+                               "TX packet to %s\n",
+                               print_mac(mac, hdr->addr1));
                 }
                 return -1;
         }
@@ -421,14 +422,15 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         u32 crc;
         struct scatterlist sg;
         int plen;
+        DECLARE_MAC_BUF(mac);
 
         hdr = (struct ieee80211_hdr_4addr *)skb->data;
 
         if (tkey->flags & IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) {
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG ": TKIP countermeasures: dropped "
-                               "received packet from " MAC_FMT "\n",
-                               MAC_ARG(hdr->addr2));
+                               "received packet from %s\n",
+                               print_mac(mac, hdr->addr2));
                 }
                 return -1;
         }
@@ -441,7 +443,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         if (!(keyidx & (1 << 5))) {
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG "TKIP: received packet without ExtIV"
-                               " flag from " MAC_FMT "\n", MAC_ARG(hdr->addr2));
+                               " flag from %s\n", print_mac(mac, hdr->addr2));
                 }
                 return -2;
         }
@@ -453,9 +455,9 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         }
         if (!tkey->key_set) {
                 if (net_ratelimit()) {
-                        printk(KERN_DEBUG "TKIP: received packet from " MAC_FMT
+                        printk(KERN_DEBUG "TKIP: received packet from %s"
                                " with keyid=%d that does not have a configured"
-                               " key\n", MAC_ARG(hdr->addr2), keyidx);
+                               " key\n", print_mac(mac, hdr->addr2), keyidx);
                 }
                 return -3;
         }
@@ -465,9 +467,9 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
 
         if (tkip_replay_check(iv32, iv16, tkey->rx_iv32, tkey->rx_iv16)) {
                 if (net_ratelimit()) {
-                        IEEE80211_DEBUG_DROP("TKIP: replay detected: STA=" MAC_FMT
+                        IEEE80211_DEBUG_DROP("TKIP: replay detected: STA=%s"
                                " previous TSC %08x%04x received TSC "
-                               "%08x%04x\n", MAC_ARG(hdr->addr2),
+                               "%08x%04x\n", print_mac(mac, hdr->addr2),
                                tkey->rx_iv32, tkey->rx_iv16, iv32, iv16);
                 }
                 tkey->dot11RSNAStatsTKIPReplays++;
@@ -489,8 +491,8 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4)) {
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG ": TKIP: failed to decrypt "
-                               "received packet from " MAC_FMT "\n",
-                               MAC_ARG(hdr->addr2));
+                               "received packet from %s\n",
+                               print_mac(mac, hdr->addr2));
                 }
                 return -7;
         }
@@ -508,7 +510,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
                 }
                 if (net_ratelimit()) {
                         IEEE80211_DEBUG_DROP("TKIP: ICV error detected: STA="
-                               MAC_FMT "\n", MAC_ARG(hdr->addr2));
+                               "%s\n", print_mac(mac, hdr->addr2));
                 }
                 tkey->dot11RSNAStatsTKIPICVErrors++;
                 return -5;
@@ -639,6 +641,7 @@ static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
 {
         struct ieee80211_tkip_data *tkey = priv;
         u8 mic[8];
+        DECLARE_MAC_BUF(mac);
 
         if (!tkey->key_set)
                 return -1;
@@ -651,8 +654,8 @@ static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
                 struct ieee80211_hdr_4addr *hdr;
                 hdr = (struct ieee80211_hdr_4addr *)skb->data;
                 printk(KERN_DEBUG "%s: Michael MIC verification failed for "
-                       "MSDU from " MAC_FMT " keyidx=%d\n",
-                       skb->dev ? skb->dev->name : "N/A", MAC_ARG(hdr->addr2),
+                       "MSDU from %s keyidx=%d\n",
+                       skb->dev ? skb->dev->name : "N/A", print_mac(mac, hdr->addr2),
                        keyidx);
                 if (skb->dev)
                         ieee80211_michael_mic_failure(skb->dev, hdr, keyidx);
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 6284c99b456e..21c0fadde03b 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -271,6 +271,7 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb,
 {
         struct ieee80211_hdr_3addr *hdr;
         int res, hdrlen;
+        DECLARE_MAC_BUF(mac);
 
         if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL)
                 return 0;
@@ -282,8 +283,8 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb,
         res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv);
         atomic_dec(&crypt->refcnt);
         if (res < 0) {
-                IEEE80211_DEBUG_DROP("decryption failed (SA=" MAC_FMT
-                                     ") res=%d\n", MAC_ARG(hdr->addr2), res);
+                IEEE80211_DEBUG_DROP("decryption failed (SA=%s"
+                                     ") res=%d\n", print_mac(mac, hdr->addr2), res);
                 if (res == -2)
                         IEEE80211_DEBUG_DROP("Decryption failed ICV "
                                              "mismatch (key %d)\n",
@@ -303,6 +304,7 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee,
 {
         struct ieee80211_hdr_3addr *hdr;
         int res, hdrlen;
+        DECLARE_MAC_BUF(mac);
 
         if (crypt == NULL || crypt->ops->decrypt_msdu == NULL)
                 return 0;
@@ -315,8 +317,8 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee,
         atomic_dec(&crypt->refcnt);
         if (res < 0) {
                 printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed"
-                       " (SA=" MAC_FMT " keyidx=%d)\n",
-                       ieee->dev->name, MAC_ARG(hdr->addr2), keyidx);
+                       " (SA=%s keyidx=%d)\n",
+                       ieee->dev->name, print_mac(mac, hdr->addr2), keyidx);
                 return -1;
         }
 
@@ -350,6 +352,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
         struct ieee80211_crypt_data *crypt = NULL;
         int keyidx = 0;
         int can_be_decrypted = 0;
+        DECLARE_MAC_BUF(mac);
 
         hdr = (struct ieee80211_hdr_4addr *)skb->data;
         stats = &ieee->stats;
@@ -459,8 +462,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
                          * frames silently instead of filling system log with
                          * these reports. */
                         IEEE80211_DEBUG_DROP("Decryption failed (not set)"
-                                             " (SA=" MAC_FMT ")\n",
-                                             MAC_ARG(hdr->addr2));
+                                             " (SA=%s)\n",
+                                             print_mac(mac, hdr->addr2));
                         ieee->ieee_stats.rx_discards_undecryptable++;
                         goto rx_dropped;
                 }
@@ -471,8 +474,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
                     fc & IEEE80211_FCTL_PROTECTED && ieee->host_decrypt &&
                     (keyidx = hostap_rx_frame_decrypt(ieee, skb, crypt)) < 0) {
                         printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth "
-                               "from " MAC_FMT "\n", dev->name,
-                               MAC_ARG(hdr->addr2));
+                               "from %s\n", dev->name,
+                               print_mac(mac, hdr->addr2));
                         /* TODO: could inform hostapd about this so that it
                          * could send auth failure report */
                         goto rx_dropped;
@@ -650,8 +653,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
                          * configured */
                 } else {
                         IEEE80211_DEBUG_DROP("encryption configured, but RX "
-                                             "frame not encrypted (SA=" MAC_FMT
-                                             ")\n", MAC_ARG(hdr->addr2));
+                                             "frame not encrypted (SA=%s"
+                                             ")\n", print_mac(mac, hdr->addr2));
                         goto rx_dropped;
                 }
         }
@@ -659,9 +662,9 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
         if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !ieee->open_wep &&
             !ieee80211_is_eapol_frame(ieee, skb)) {
                 IEEE80211_DEBUG_DROP("dropped unencrypted RX data "
-                                     "frame from " MAC_FMT
+                                     "frame from %s"
                                      " (drop_unencrypted=1)\n",
-                                     MAC_ARG(hdr->addr2));
+                                     print_mac(mac, hdr->addr2));
                 goto rx_dropped;
         }
 
@@ -1411,6 +1414,8 @@ static int ieee80211_network_init(struct ieee80211_device *ieee, struct ieee8021
                                          struct ieee80211_network *network,
                                          struct ieee80211_rx_stats *stats)
 {
+        DECLARE_MAC_BUF(mac);
+
         network->qos_data.active = 0;
         network->qos_data.supported = 0;
         network->qos_data.param_count = 0;
@@ -1457,11 +1462,11 @@ static int ieee80211_network_init(struct ieee80211_device *ieee, struct ieee8021
         }
 
         if (network->mode == 0) {
-                IEEE80211_DEBUG_SCAN("Filtered out '%s (" MAC_FMT ")' "
+                IEEE80211_DEBUG_SCAN("Filtered out '%s (%s)' "
                                      "network.\n",
                                      escape_essid(network->ssid,
                                                   network->ssid_len),
-                                     MAC_ARG(network->bssid));
+                                     print_mac(mac, network->bssid));
                 return 1;
         }
 
@@ -1490,6 +1495,7 @@ static void update_network(struct ieee80211_network *dst,
 {
         int qos_active;
         u8 old_param;
+        DECLARE_MAC_BUF(mac);
 
         ieee80211_network_reset(dst);
         dst->ibss_dfs = src->ibss_dfs;
@@ -1503,8 +1509,8 @@ static void update_network(struct ieee80211_network *dst,
                 memcpy(&dst->stats, &src->stats,
                        sizeof(struct ieee80211_rx_stats));
         else
-                IEEE80211_DEBUG_SCAN("Network " MAC_FMT " info received "
-                        "off channel (%d vs. %d)\n", MAC_ARG(src->bssid),
+                IEEE80211_DEBUG_SCAN("Network %s info received "
+                        "off channel (%d vs. %d)\n", print_mac(mac, src->bssid),
                         dst->channel, src->stats.received_channel);
 
         dst->capability = src->capability;
@@ -1576,12 +1582,13 @@ static void ieee80211_process_probe_response(struct ieee80211_device
         struct ieee80211_info_element *info_element = beacon->info_element;
 #endif
         unsigned long flags;
+        DECLARE_MAC_BUF(mac);
 
-        IEEE80211_DEBUG_SCAN("'%s' (" MAC_FMT
+        IEEE80211_DEBUG_SCAN("'%s' (%s"
                              "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
                              escape_essid(info_element->data,
                                           info_element->len),
-                             MAC_ARG(beacon->header.addr3),
+                             print_mac(mac, beacon->header.addr3),
                              (beacon->capability & (1 << 0xf)) ? '1' : '0',
                              (beacon->capability & (1 << 0xe)) ? '1' : '0',
                              (beacon->capability & (1 << 0xd)) ? '1' : '0',
@@ -1600,10 +1607,10 @@ static void ieee80211_process_probe_response(struct ieee80211_device
                              (beacon->capability & (1 << 0x0)) ? '1' : '0');
 
         if (ieee80211_network_init(ieee, beacon, &network, stats)) {
-                IEEE80211_DEBUG_SCAN("Dropped '%s' (" MAC_FMT ") via %s.\n",
+                IEEE80211_DEBUG_SCAN("Dropped '%s' (%s) via %s.\n",
                                      escape_essid(info_element->data,
                                                   info_element->len),
-                                     MAC_ARG(beacon->header.addr3),
+                                     print_mac(mac, beacon->header.addr3),
                                      is_beacon(beacon->header.frame_ctl) ?
                                      "BEACON" : "PROBE RESPONSE");
                 return;
@@ -1637,11 +1644,11 @@ static void ieee80211_process_probe_response(struct ieee80211_device
                         /* If there are no more slots, expire the oldest */
                         list_del(&oldest->list);
                         target = oldest;
-                        IEEE80211_DEBUG_SCAN("Expired '%s' (" MAC_FMT ") from "
+                        IEEE80211_DEBUG_SCAN("Expired '%s' (%s) from "
                                              "network list.\n",
                                              escape_essid(target->ssid,
                                                           target->ssid_len),
-                                             MAC_ARG(target->bssid));
+                                             print_mac(mac, target->bssid));
                         ieee80211_network_reset(target);
                 } else {
                         /* Otherwise just pull from the free list */
@@ -1651,10 +1658,10 @@ static void ieee80211_process_probe_response(struct ieee80211_device
                 }
 
 #ifdef CONFIG_IEEE80211_DEBUG
-                IEEE80211_DEBUG_SCAN("Adding '%s' (" MAC_FMT ") via %s.\n",
+                IEEE80211_DEBUG_SCAN("Adding '%s' (%s) via %s.\n",
                                      escape_essid(network.ssid,
                                                   network.ssid_len),
-                                     MAC_ARG(network.bssid),
+                                     print_mac(mac, network.bssid),
                                      is_beacon(beacon->header.frame_ctl) ?
                                      "BEACON" : "PROBE RESPONSE");
 #endif
@@ -1662,10 +1669,10 @@ static void ieee80211_process_probe_response(struct ieee80211_device
                 network.ibss_dfs = NULL;
                 list_add_tail(&target->list, &ieee->network_list);
         } else {
-                IEEE80211_DEBUG_SCAN("Updating '%s' (" MAC_FMT ") via %s.\n",
+                IEEE80211_DEBUG_SCAN("Updating '%s' (%s) via %s.\n",
                                      escape_essid(target->ssid,
                                                   target->ssid_len),
-                                     MAC_ARG(target->bssid),
+                                     print_mac(mac, target->bssid),
                                      is_beacon(beacon->header.frame_ctl) ?
                                      "BEACON" : "PROBE RESPONSE");
                 update_network(target, &network);
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index 465b73d50532..9b58dd67acb6 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -257,6 +257,7 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
         char *ev = extra;
         char *stop = ev + wrqu->data.length;
         int i = 0;
+        DECLARE_MAC_BUF(mac);
 
         IEEE80211_DEBUG_WX("Getting scan\n");
 
@@ -274,10 +275,10 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
                         ev = ieee80211_translate_scan(ieee, ev, stop, network);
                 else
                         IEEE80211_DEBUG_SCAN("Not showing network '%s ("
-                                             MAC_FMT ")' due to age (%dms).\n",
+                                             "%s)' due to age (%dms).\n",
                                              escape_essid(network->ssid,
                                                           network->ssid_len),
-                                             MAC_ARG(network->bssid),
+                                             print_mac(mac, network->bssid),
                                              jiffies_to_msecs(jiffies -
                                                               network->
                                                               last_scanned));
diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c
index e475f2e1be13..4c0feb2dacd8 100644
--- a/net/ieee80211/softmac/ieee80211softmac_assoc.c
+++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c
@@ -372,6 +372,7 @@ ieee80211softmac_handle_assoc_response(struct net_device * dev,
         u16 status = le16_to_cpup(&resp->status);
         struct ieee80211softmac_network *network = NULL;
         unsigned long flags;
+        DECLARE_MAC_BUF(mac2);
 
         if (unlikely(!mac->running))
                 return -ENODEV;
@@ -388,7 +389,8 @@ ieee80211softmac_handle_assoc_response(struct net_device * dev,
 
         /* someone sending us things without us knowing him? Ignore. */
         if (!network) {
-                dprintk(KERN_INFO PFX "Received unrequested assocation response from " MAC_FMT "\n", MAC_ARG(resp->header.addr3));
+                dprintk(KERN_INFO PFX "Received unrequested assocation response from %s\n",
+                        print_mac(mac2, resp->header.addr3));
                 spin_unlock_irqrestore(&mac->lock, flags);
                 return 0;
         }
diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c
index 826c32d24461..855fa0fe641b 100644
--- a/net/ieee80211/softmac/ieee80211softmac_auth.c
+++ b/net/ieee80211/softmac/ieee80211softmac_auth.c
@@ -35,6 +35,7 @@ ieee80211softmac_auth_req(struct ieee80211softmac_device *mac,
 {
         struct ieee80211softmac_auth_queue_item *auth;
         unsigned long flags;
+        DECLARE_MAC_BUF(mac2);
 
         if (net->authenticating || net->authenticated)
                 return 0;
@@ -43,7 +44,7 @@ ieee80211softmac_auth_req(struct ieee80211softmac_device *mac,
         /* Add the network if it's not already added */
         ieee80211softmac_add_network(mac, net);
 
-        dprintk(KERN_NOTICE PFX "Queueing Authentication Request to "MAC_FMT"\n", MAC_ARG(net->bssid));
+        dprintk(KERN_NOTICE PFX "Queueing Authentication Request to %s\n", print_mac(mac2, net->bssid));
         /* Queue the auth request */
         auth = (struct ieee80211softmac_auth_queue_item *)
                 kmalloc(sizeof(struct ieee80211softmac_auth_queue_item), GFP_KERNEL);
@@ -76,6 +77,7 @@ ieee80211softmac_auth_queue(struct work_struct *work)
         struct ieee80211softmac_auth_queue_item *auth;
         struct ieee80211softmac_network *net;
         unsigned long flags;
+        DECLARE_MAC_BUF(mac2);
 
         auth = container_of(work, struct ieee80211softmac_auth_queue_item,
                             work.work);
@@ -99,13 +101,14 @@ ieee80211softmac_auth_queue(struct work_struct *work)
                 auth->retry--;
                 spin_unlock_irqrestore(&mac->lock, flags);
                 if (ieee80211softmac_send_mgt_frame(mac, auth->net, IEEE80211_STYPE_AUTH, auth->state))
-                        dprintk(KERN_NOTICE PFX "Sending Authentication Request to "MAC_FMT" failed (this shouldn't happen, wait for the timeout).\n", MAC_ARG(net->bssid));
+                        dprintk(KERN_NOTICE PFX "Sending Authentication Request to %s failed (this shouldn't happen, wait for the timeout).\n",
+                                print_mac(mac2, net->bssid));
                 else
-                        dprintk(KERN_NOTICE PFX "Sent Authentication Request to "MAC_FMT".\n", MAC_ARG(net->bssid));
+                        dprintk(KERN_NOTICE PFX "Sent Authentication Request to %s.\n", print_mac(mac2, net->bssid));
                 return;
         }
 
-        printkl(KERN_WARNING PFX "Authentication timed out with "MAC_FMT"\n", MAC_ARG(net->bssid));
+        printkl(KERN_WARNING PFX "Authentication timed out with %s\n", print_mac(mac2, net->bssid));
         /* Remove this item from the queue */
         spin_lock_irqsave(&mac->lock, flags);
         net->authenticating = 0;
@@ -142,6 +145,7 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth)
         struct ieee80211softmac_network *net = NULL;
         unsigned long flags;
         u8 * data;
+        DECLARE_MAC_BUF(mac2);
 
         if (unlikely(!mac->running))
                 return -ENODEV;
@@ -161,7 +165,7 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth)
         /* Make sure that we've got an auth queue item for this request */
         if(aq == NULL)
         {
-                dprintkl(KERN_DEBUG PFX "Authentication response received from "MAC_FMT" but no queue item exists.\n", MAC_ARG(auth->header.addr2));
+                dprintkl(KERN_DEBUG PFX "Authentication response received from %s but no queue item exists.\n", print_mac(mac2, auth->header.addr2));
                 /* Error #? */
                 return -1;
         }
@@ -169,7 +173,7 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth)
         /* Check for out of order authentication */
         if(!net->authenticating)
         {
-                dprintkl(KERN_DEBUG PFX "Authentication response received from "MAC_FMT" but did not request authentication.\n",MAC_ARG(auth->header.addr2));
+                dprintkl(KERN_DEBUG PFX "Authentication response received from %s but did not request authentication.\n",print_mac(mac2, auth->header.addr2));
                 return -1;
         }
 
@@ -187,7 +191,7 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth)
                         spin_unlock_irqrestore(&mac->lock, flags);
 
                         /* Send event */
-                        printkl(KERN_NOTICE PFX "Open Authentication completed with "MAC_FMT"\n", MAC_ARG(net->bssid));
+                        printkl(KERN_NOTICE PFX "Open Authentication completed with %s\n", print_mac(mac2, net->bssid));
                         ieee80211softmac_call_events(mac, IEEE80211SOFTMAC_EVENT_AUTHENTICATED, net);
                         break;
                 default:
@@ -197,8 +201,8 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth)
                         net->authenticating = 0;
                         spin_unlock_irqrestore(&mac->lock, flags);
 
-                        printkl(KERN_NOTICE PFX "Open Authentication with "MAC_FMT" failed, error code: %i\n",
-                                MAC_ARG(net->bssid), le16_to_cpup(&auth->status));
+                        printkl(KERN_NOTICE PFX "Open Authentication with %s failed, error code: %i\n",
+                                print_mac(mac2, net->bssid), le16_to_cpup(&auth->status));
                         /* Count the error? */
                         break;
                 }
@@ -253,13 +257,13 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth)
                                 net->authenticating = 0;
                                 net->authenticated = 1;
                                 spin_unlock_irqrestore(&mac->lock, flags);
-                                printkl(KERN_NOTICE PFX "Shared Key Authentication completed with "MAC_FMT"\n",
-                                        MAC_ARG(net->bssid));
+                                printkl(KERN_NOTICE PFX "Shared Key Authentication completed with %s\n",
+                                        print_mac(mac2, net->bssid));
                                 ieee80211softmac_call_events(mac, IEEE80211SOFTMAC_EVENT_AUTHENTICATED, net);
                                 break;
                         default:
-                                printkl(KERN_NOTICE PFX "Shared Key Authentication with "MAC_FMT" failed, error code: %i\n",
-                                        MAC_ARG(net->bssid), le16_to_cpup(&auth->status));
+                                printkl(KERN_NOTICE PFX "Shared Key Authentication with %s failed, error code: %i\n",
+                                        print_mac(mac2, net->bssid), le16_to_cpup(&auth->status));
                                 /* Lock and reset flags */
                                 spin_lock_irqsave(&mac->lock, flags);
                                 net->authenticating = 0;
@@ -375,6 +379,7 @@ ieee80211softmac_deauth_resp(struct net_device *dev, struct ieee80211_deauth *de
 
         struct ieee80211softmac_network *net = NULL;
         struct ieee80211softmac_device *mac = ieee80211_priv(dev);
+        DECLARE_MAC_BUF(mac2);
 
         if (unlikely(!mac->running))
                 return -ENODEV;
@@ -387,8 +392,8 @@ ieee80211softmac_deauth_resp(struct net_device *dev, struct ieee80211_deauth *de
         net = ieee80211softmac_get_network_by_bssid(mac, deauth->header.addr2);
 
         if (net == NULL) {
-                dprintkl(KERN_DEBUG PFX "Received deauthentication packet from "MAC_FMT", but that network is unknown.\n",
-                        MAC_ARG(deauth->header.addr2));
+                dprintkl(KERN_DEBUG PFX "Received deauthentication packet from %s, but that network is unknown.\n",
+                        print_mac(mac2, deauth->header.addr2));
                 return 0;
         }
 
diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c
index 5742dc803b79..8e8ad08a411c 100644
--- a/net/ieee80211/softmac/ieee80211softmac_wx.c
+++ b/net/ieee80211/softmac/ieee80211softmac_wx.c
@@ -72,6 +72,7 @@ ieee80211softmac_wx_set_essid(struct net_device *net_dev,
         struct ieee80211softmac_device *sm = ieee80211_priv(net_dev);
         struct ieee80211softmac_auth_queue_item *authptr;
         int length = 0;
+        DECLARE_MAC_BUF(mac);
 
 check_assoc_again:
         mutex_lock(&sm->associnfo.mutex);
diff --git a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c
index a4c1c9545827..87039c2fb6a2 100644
--- a/net/irda/irlan/irlan_client.c
+++ b/net/irda/irlan/irlan_client.c
@@ -436,6 +436,7 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
         __u16 tmp_cpu; /* Temporary value in host order */
         __u8 *bytes;
         int i;
+        DECLARE_MAC_BUF(mac);
 
         IRDA_DEBUG(4, "%s(), parm=%s\n", __FUNCTION__ , param);
 
@@ -520,9 +521,8 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
         /* FILTER_ENTRY, have we got an ethernet address? */
         if (strcmp(param, "FILTER_ENTRY") == 0) {
                 bytes = value;
-                IRDA_DEBUG(4, "Ethernet address = %02x:%02x:%02x:%02x:%02x:%02x\n",
-                      bytes[0], bytes[1], bytes[2], bytes[3], bytes[4],
-                      bytes[5]);
+                IRDA_DEBUG(4, "Ethernet address = %s\n",
+                           print_mac(mac, bytes));
                 for (i = 0; i < 6; i++)
                         self->dev->dev_addr[i] = bytes[i];
         }
diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
index 4865d82896b1..cb34bc0518e8 100644
--- a/net/llc/llc_proc.c
+++ b/net/llc/llc_proc.c
@@ -25,10 +25,10 @@
 #include <net/llc_c_st.h>
 #include <net/llc_conn.h>
 
-static void llc_ui_format_mac(struct seq_file *seq, unsigned char *mac)
+static void llc_ui_format_mac(struct seq_file *seq, u8 *addr)
 {
-        seq_printf(seq, "%02X:%02X:%02X:%02X:%02X:%02X",
-                   mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+        DECLARE_MAC_BUF(mac);
+        seq_printf(seq, "%s", print_mac(mac, addr));
 }
 
 static struct sock *llc_get_sk_idx(loff_t pos)
@@ -128,8 +128,10 @@ static int llc_seq_socket_show(struct seq_file *seq, void *v)
 
         if (llc->dev)
                 llc_ui_format_mac(seq, llc->dev->dev_addr);
-        else
-                seq_printf(seq, "00:00:00:00:00:00");
+        else {
+                u8 addr[6] = {0,0,0,0,0,0};
+                llc_ui_format_mac(seq, addr);
+        }
         seq_printf(seq, "@%02X ", llc->sap->laddr.lsap);
         llc_ui_format_mac(seq, llc->daddr.mac);
         seq_printf(seq, "@%02X %8d %8d %2d %3d %4d\n", llc->daddr.lsap,
diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c
index 8e4a1bcd16ea..c881524c8725 100644
--- a/net/mac80211/debugfs_key.c
+++ b/net/mac80211/debugfs_key.c
@@ -262,11 +262,12 @@ void ieee80211_debugfs_key_sta_link(struct ieee80211_key *key,
                                     struct sta_info *sta)
 {
         char buf[50];
+        DECLARE_MAC_BUF(mac);
 
         if (!key->debugfs.dir)
                 return;
 
-        sprintf(buf, "../../stations/" MAC_FMT, MAC_ARG(sta->addr));
+        sprintf(buf, "../../stations/%s", print_mac(mac, sta->addr));
         key->debugfs.stalink =
                 debugfs_create_symlink("station", key->debugfs.dir, buf);
 }
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
index 8ceda33efc12..9efb84c47bb0 100644
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -66,7 +66,8 @@ static ssize_t ieee80211_if_fmt_##name(					\
         const struct ieee80211_sub_if_data *sdata, char *buf,           \
         int buflen)                                                     \
 {                                                                       \
-        return scnprintf(buf, buflen, MAC_FMT "\n", MAC_ARG(sdata->field));\
+        DECLARE_MAC_BUF(mac);                                           \
+        return scnprintf(buf, buflen, "%s\n", print_mac(mac, sdata->field));\
 }
 
 #define __IEEE80211_IF_FILE(name)                                       \
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index 2daaa802bbd0..f7c717c906dc 100644
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -203,15 +203,15 @@ STA_OPS(wme_tx_queue);
 
 void ieee80211_sta_debugfs_add(struct sta_info *sta)
 {
-        char buf[3*6];
         struct dentry *stations_dir = sta->local->debugfs.stations;
+        DECLARE_MAC_BUF(mac);
 
         if (!stations_dir)
                 return;
 
-        sprintf(buf, MAC_FMT, MAC_ARG(sta->addr));
+        print_mac(mac, sta->addr);
 
-        sta->debugfs.dir = debugfs_create_dir(buf, stations_dir);
+        sta->debugfs.dir = debugfs_create_dir(mac, stations_dir);
         if (!sta->debugfs.dir)
                 return;
 
diff --git a/net/mac80211/event.c b/net/mac80211/event.c
index 68a526cb7623..2280f40b4560 100644
--- a/net/mac80211/event.c
+++ b/net/mac80211/event.c
@@ -22,13 +22,14 @@ void mac80211_ev_michael_mic_failure(struct net_device *dev, int keyidx,
 {
         union iwreq_data wrqu;
         char *buf = kmalloc(128, GFP_ATOMIC);
+        DECLARE_MAC_BUF(mac);
 
         if (buf) {
                 /* TODO: needed parameters: count, key type, TSC */
                 sprintf(buf, "MLME-MICHAELMICFAILURE.indication("
-                        "keyid=%d %scast addr=" MAC_FMT ")",
+                        "keyid=%d %scast addr=%s)",
                         keyidx, hdr->addr1[0] & 0x01 ? "broad" : "uni",
-                        MAC_ARG(hdr->addr2));
+                        print_mac(mac, hdr->addr2));
                 memset(&wrqu, 0, sizeof(wrqu));
                 wrqu.data.length = strlen(buf);
                 wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 0c1f7b2e157c..4229d150e783 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -602,6 +602,7 @@ int ieee80211_if_update_wds(struct net_device *dev, u8 *remote_addr)
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
         struct sta_info *sta;
+        DECLARE_MAC_BUF(mac);
 
         if (compare_ether_addr(remote_addr, sdata->u.wds.remote_addr) == 0)
                 return 0;
@@ -619,8 +620,8 @@ int ieee80211_if_update_wds(struct net_device *dev, u8 *remote_addr)
                 sta_info_put(sta);
         } else {
                 printk(KERN_DEBUG "%s: could not find STA entry for WDS link "
-                       "peer " MAC_FMT "\n",
-                       dev->name, MAC_ARG(sdata->u.wds.remote_addr));
+                       "peer %s\n",
+                       dev->name, print_mac(mac, sdata->u.wds.remote_addr));
         }
 
         /* Update WDS link data */
diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c
index 51dca21f77c7..6ccdde82bded 100644
--- a/net/mac80211/ieee80211_ioctl.c
+++ b/net/mac80211/ieee80211_ioctl.c
@@ -98,9 +98,10 @@ static int ieee80211_set_encryption(struct net_device *dev, u8 *sta_addr,
                 sta = sta_info_get(local, sta_addr);
                 if (!sta) {
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+                        DECLARE_MAC_BUF(mac);
                         printk(KERN_DEBUG "%s: set_encrypt - unknown addr "
-                               MAC_FMT "\n",
-                               dev->name, MAC_ARG(sta_addr));
+                               "%s\n",
+                               dev->name, print_mac(mac, sta_addr));
 #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
 
                         return -ENOENT;
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index 8fdbd38e02c4..f47cbd294ceb 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -319,14 +319,15 @@ static void ieee80211_handle_erp_ie(struct net_device *dev, u8 erp_value)
         int use_protection = (erp_value & WLAN_ERP_USE_PROTECTION) != 0;
         int preamble_mode = (erp_value & WLAN_ERP_BARKER_PREAMBLE) != 0;
         u8 changes = 0;
+        DECLARE_MAC_BUF(mac);
 
         if (use_protection != !!(sdata->flags & IEEE80211_SDATA_USE_PROTECTION)) {
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG "%s: CTS protection %s (BSSID="
-                               MAC_FMT ")\n",
+                               "%s)\n",
                                dev->name,
                                use_protection ? "enabled" : "disabled",
-                               MAC_ARG(ifsta->bssid));
+                               print_mac(mac, ifsta->bssid));
                 }
                 if (use_protection)
                         sdata->flags |= IEEE80211_SDATA_USE_PROTECTION;
@@ -338,11 +339,11 @@ static void ieee80211_handle_erp_ie(struct net_device *dev, u8 erp_value)
         if (preamble_mode != !(sdata->flags & IEEE80211_SDATA_SHORT_PREAMBLE)) {
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG "%s: switched to %s barker preamble"
-                               " (BSSID=" MAC_FMT ")\n",
+                               " (BSSID=%s)\n",
                                dev->name,
                                (preamble_mode == WLAN_ERP_PREAMBLE_SHORT) ?
                                         "short" : "long",
-                               MAC_ARG(ifsta->bssid));
+                               print_mac(mac, ifsta->bssid));
                 }
                 if (preamble_mode)
                         sdata->flags &= ~IEEE80211_SDATA_SHORT_PREAMBLE;
@@ -524,18 +525,20 @@ static void ieee80211_send_auth(struct net_device *dev,
 static void ieee80211_authenticate(struct net_device *dev,
                                    struct ieee80211_if_sta *ifsta)
 {
+        DECLARE_MAC_BUF(mac);
+
         ifsta->auth_tries++;
         if (ifsta->auth_tries > IEEE80211_AUTH_MAX_TRIES) {
-                printk(KERN_DEBUG "%s: authentication with AP " MAC_FMT
+                printk(KERN_DEBUG "%s: authentication with AP %s"
                        " timed out\n",
-                       dev->name, MAC_ARG(ifsta->bssid));
+                       dev->name, print_mac(mac, ifsta->bssid));
                 ifsta->state = IEEE80211_DISABLED;
                 return;
         }
 
         ifsta->state = IEEE80211_AUTHENTICATE;
-        printk(KERN_DEBUG "%s: authenticate with AP " MAC_FMT "\n",
-               dev->name, MAC_ARG(ifsta->bssid));
+        printk(KERN_DEBUG "%s: authenticate with AP %s\n",
+               dev->name, print_mac(mac, ifsta->bssid));
 
         ieee80211_send_auth(dev, ifsta, 1, NULL, 0, 0);
 
@@ -744,18 +747,20 @@ static int ieee80211_privacy_mismatch(struct net_device *dev,
 static void ieee80211_associate(struct net_device *dev,
                                 struct ieee80211_if_sta *ifsta)
 {
+        DECLARE_MAC_BUF(mac);
+
         ifsta->assoc_tries++;
         if (ifsta->assoc_tries > IEEE80211_ASSOC_MAX_TRIES) {
-                printk(KERN_DEBUG "%s: association with AP " MAC_FMT
+                printk(KERN_DEBUG "%s: association with AP %s"
                        " timed out\n",
-                       dev->name, MAC_ARG(ifsta->bssid));
+                       dev->name, print_mac(mac, ifsta->bssid));
                 ifsta->state = IEEE80211_DISABLED;
                 return;
         }
 
         ifsta->state = IEEE80211_ASSOCIATE;
-        printk(KERN_DEBUG "%s: associate with AP " MAC_FMT "\n",
-               dev->name, MAC_ARG(ifsta->bssid));
+        printk(KERN_DEBUG "%s: associate with AP %s\n",
+               dev->name, print_mac(mac, ifsta->bssid));
         if (ieee80211_privacy_mismatch(dev, ifsta)) {
                 printk(KERN_DEBUG "%s: mismatch in privacy configuration and "
                        "mixed-cell disabled - abort association\n", dev->name);
@@ -775,6 +780,7 @@ static void ieee80211_associated(struct net_device *dev,
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
         struct sta_info *sta;
         int disassoc;
+        DECLARE_MAC_BUF(mac);
 
         /* TODO: start monitoring current AP signal quality and number of
          * missed beacons. Scan other channels every now and then and search
@@ -785,8 +791,8 @@ static void ieee80211_associated(struct net_device *dev,
 
         sta = sta_info_get(local, ifsta->bssid);
         if (!sta) {
-                printk(KERN_DEBUG "%s: No STA entry for own AP " MAC_FMT "\n",
-                       dev->name, MAC_ARG(ifsta->bssid));
+                printk(KERN_DEBUG "%s: No STA entry for own AP %s\n",
+                       dev->name, print_mac(mac, ifsta->bssid));
                 disassoc = 1;
         } else {
                 disassoc = 0;
@@ -794,9 +800,9 @@ static void ieee80211_associated(struct net_device *dev,
                                sta->last_rx + IEEE80211_MONITORING_INTERVAL)) {
                         if (ifsta->flags & IEEE80211_STA_PROBEREQ_POLL) {
                                 printk(KERN_DEBUG "%s: No ProbeResp from "
-                                       "current AP " MAC_FMT " - assume out of "
+                                       "current AP %s - assume out of "
                                        "range\n",
-                                       dev->name, MAC_ARG(ifsta->bssid));
+                                       dev->name, print_mac(mac, ifsta->bssid));
                                 disassoc = 1;
                                 sta_info_free(sta);
                         } else
@@ -944,37 +950,38 @@ static void ieee80211_rx_mgmt_auth(struct net_device *dev,
 {
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
         u16 auth_alg, auth_transaction, status_code;
+        DECLARE_MAC_BUF(mac);
 
         if (ifsta->state != IEEE80211_AUTHENTICATE &&
             sdata->type != IEEE80211_IF_TYPE_IBSS) {
                 printk(KERN_DEBUG "%s: authentication frame received from "
-                       MAC_FMT ", but not in authenticate state - ignored\n",
-                       dev->name, MAC_ARG(mgmt->sa));
+                       "%s, but not in authenticate state - ignored\n",
+                       dev->name, print_mac(mac, mgmt->sa));
                 return;
         }
 
         if (len < 24 + 6) {
                 printk(KERN_DEBUG "%s: too short (%zd) authentication frame "
-                       "received from " MAC_FMT " - ignored\n",
-                       dev->name, len, MAC_ARG(mgmt->sa));
+                       "received from %s - ignored\n",
+                       dev->name, len, print_mac(mac, mgmt->sa));
                 return;
         }
 
         if (sdata->type != IEEE80211_IF_TYPE_IBSS &&
             memcmp(ifsta->bssid, mgmt->sa, ETH_ALEN) != 0) {
                 printk(KERN_DEBUG "%s: authentication frame received from "
-                       "unknown AP (SA=" MAC_FMT " BSSID=" MAC_FMT ") - "
-                       "ignored\n", dev->name, MAC_ARG(mgmt->sa),
-                       MAC_ARG(mgmt->bssid));
+                       "unknown AP (SA=%s BSSID=%s) - "
+                       "ignored\n", dev->name, print_mac(mac, mgmt->sa),
+                       print_mac(mac, mgmt->bssid));
                 return;
         }
 
         if (sdata->type != IEEE80211_IF_TYPE_IBSS &&
             memcmp(ifsta->bssid, mgmt->bssid, ETH_ALEN) != 0) {
                 printk(KERN_DEBUG "%s: authentication frame received from "
-                       "unknown BSSID (SA=" MAC_FMT " BSSID=" MAC_FMT ") - "
-                       "ignored\n", dev->name, MAC_ARG(mgmt->sa),
-                       MAC_ARG(mgmt->bssid));
+                       "unknown BSSID (SA=%s BSSID=%s) - "
+                       "ignored\n", dev->name, print_mac(mac, mgmt->sa),
+                       print_mac(mac, mgmt->bssid));
                 return;
         }
 
@@ -982,9 +989,9 @@ static void ieee80211_rx_mgmt_auth(struct net_device *dev,
         auth_transaction = le16_to_cpu(mgmt->u.auth.auth_transaction);
         status_code = le16_to_cpu(mgmt->u.auth.status_code);
 
-        printk(KERN_DEBUG "%s: RX authentication from " MAC_FMT " (alg=%d "
+        printk(KERN_DEBUG "%s: RX authentication from %s (alg=%d "
                "transaction=%d status=%d)\n",
-               dev->name, MAC_ARG(mgmt->sa), auth_alg,
+               dev->name, print_mac(mac, mgmt->sa), auth_alg,
                auth_transaction, status_code);
 
         if (sdata->type == IEEE80211_IF_TYPE_IBSS) {
@@ -1071,27 +1078,28 @@ static void ieee80211_rx_mgmt_deauth(struct net_device *dev,
                                      size_t len)
 {
         u16 reason_code;
+        DECLARE_MAC_BUF(mac);
 
         if (len < 24 + 2) {
                 printk(KERN_DEBUG "%s: too short (%zd) deauthentication frame "
-                       "received from " MAC_FMT " - ignored\n",
-                       dev->name, len, MAC_ARG(mgmt->sa));
+                       "received from %s - ignored\n",
+                       dev->name, len, print_mac(mac, mgmt->sa));
                 return;
         }
 
         if (memcmp(ifsta->bssid, mgmt->sa, ETH_ALEN) != 0) {
                 printk(KERN_DEBUG "%s: deauthentication frame received from "
-                       "unknown AP (SA=" MAC_FMT " BSSID=" MAC_FMT ") - "
-                       "ignored\n", dev->name, MAC_ARG(mgmt->sa),
-                       MAC_ARG(mgmt->bssid));
+                       "unknown AP (SA=%s BSSID=%s) - "
+                       "ignored\n", dev->name, print_mac(mac, mgmt->sa),
+                       print_mac(mac, mgmt->bssid));
                 return;
         }
 
         reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);
 
-        printk(KERN_DEBUG "%s: RX deauthentication from " MAC_FMT
+        printk(KERN_DEBUG "%s: RX deauthentication from %s"
                " (reason=%d)\n",
-               dev->name, MAC_ARG(mgmt->sa), reason_code);
+               dev->name, print_mac(mac, mgmt->sa), reason_code);
 
         if (ifsta->flags & IEEE80211_STA_AUTHENTICATED) {
                 printk(KERN_DEBUG "%s: deauthenticated\n", dev->name);
@@ -1116,27 +1124,28 @@ static void ieee80211_rx_mgmt_disassoc(struct net_device *dev,
                                        size_t len)
 {
         u16 reason_code;
+        DECLARE_MAC_BUF(mac);
 
         if (len < 24 + 2) {
                 printk(KERN_DEBUG "%s: too short (%zd) disassociation frame "
-                       "received from " MAC_FMT " - ignored\n",
-                       dev->name, len, MAC_ARG(mgmt->sa));
+                       "received from %s - ignored\n",
+                       dev->name, len, print_mac(mac, mgmt->sa));
                 return;
         }
 
         if (memcmp(ifsta->bssid, mgmt->sa, ETH_ALEN) != 0) {
                 printk(KERN_DEBUG "%s: disassociation frame received from "
-                       "unknown AP (SA=" MAC_FMT " BSSID=" MAC_FMT ") - "
-                       "ignored\n", dev->name, MAC_ARG(mgmt->sa),
-                       MAC_ARG(mgmt->bssid));
+                       "unknown AP (SA=%s BSSID=%s) - "
+                       "ignored\n", dev->name, print_mac(mac, mgmt->sa),
+                       print_mac(mac, mgmt->bssid));
                 return;
         }
 
         reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
 
-        printk(KERN_DEBUG "%s: RX disassociation from " MAC_FMT
+        printk(KERN_DEBUG "%s: RX disassociation from %s"
                " (reason=%d)\n",
-               dev->name, MAC_ARG(mgmt->sa), reason_code);
+               dev->name, print_mac(mac, mgmt->sa), reason_code);
 
         if (ifsta->flags & IEEE80211_STA_ASSOCIATED)
                 printk(KERN_DEBUG "%s: disassociated\n", dev->name);
@@ -1165,29 +1174,30 @@ static void ieee80211_rx_mgmt_assoc_resp(struct net_device *dev,
         struct ieee802_11_elems elems;
         u8 *pos;
         int i, j;
+        DECLARE_MAC_BUF(mac);
 
         /* AssocResp and ReassocResp have identical structure, so process both
          * of them in this function. */
 
         if (ifsta->state != IEEE80211_ASSOCIATE) {
                 printk(KERN_DEBUG "%s: association frame received from "
-                       MAC_FMT ", but not in associate state - ignored\n",
-                       dev->name, MAC_ARG(mgmt->sa));
+                       "%s, but not in associate state - ignored\n",
+                       dev->name, print_mac(mac, mgmt->sa));
                 return;
         }
 
         if (len < 24 + 6) {
                 printk(KERN_DEBUG "%s: too short (%zd) association frame "
-                       "received from " MAC_FMT " - ignored\n",
-                       dev->name, len, MAC_ARG(mgmt->sa));
+                       "received from %s - ignored\n",
+                       dev->name, len, print_mac(mac, mgmt->sa));
                 return;
         }
 
         if (memcmp(ifsta->bssid, mgmt->sa, ETH_ALEN) != 0) {
                 printk(KERN_DEBUG "%s: association frame received from "
-                       "unknown AP (SA=" MAC_FMT " BSSID=" MAC_FMT ") - "
-                       "ignored\n", dev->name, MAC_ARG(mgmt->sa),
-                       MAC_ARG(mgmt->bssid));
+                       "unknown AP (SA=%s BSSID=%s) - "
+                       "ignored\n", dev->name, print_mac(mac, mgmt->sa),
+                       print_mac(mac, mgmt->bssid));
                 return;
         }
 
@@ -1199,9 +1209,9 @@ static void ieee80211_rx_mgmt_assoc_resp(struct net_device *dev,
                        "set\n", dev->name, aid);
         aid &= ~(BIT(15) | BIT(14));
 
-        printk(KERN_DEBUG "%s: RX %sssocResp from " MAC_FMT " (capab=0x%x "
+        printk(KERN_DEBUG "%s: RX %sssocResp from %s (capab=0x%x "
                "status=%d aid=%d)\n",
-               dev->name, reassoc ? "Rea" : "A", MAC_ARG(mgmt->sa),
+               dev->name, reassoc ? "Rea" : "A", print_mac(mac, mgmt->sa),
                capab_info, status_code, aid);
 
         if (status_code != WLAN_STATUS_SUCCESS) {
@@ -1435,14 +1445,16 @@ static void ieee80211_rx_bss_info(struct net_device *dev,
         struct sta_info *sta;
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
         u64 timestamp;
+        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mac2);
 
         if (!beacon && memcmp(mgmt->da, dev->dev_addr, ETH_ALEN))
                 return; /* ignore ProbeResp to foreign address */
 
 #if 0
-        printk(KERN_DEBUG "%s: RX %s from " MAC_FMT " to " MAC_FMT "\n",
+        printk(KERN_DEBUG "%s: RX %s from %s to %s\n",
                dev->name, beacon ? "Beacon" : "Probe Response",
-               MAC_ARG(mgmt->sa), MAC_ARG(mgmt->da));
+               print_mac(mac, mgmt->sa), print_mac(mac2, mgmt->da));
 #endif
 
         baselen = (u8 *) mgmt->u.beacon.variable - (u8 *) mgmt;
@@ -1461,10 +1473,10 @@ static void ieee80211_rx_bss_info(struct net_device *dev,
                 else
                         tsf = -1LLU;
                 if (time_after(jiffies, last_tsf_debug + 5 * HZ)) {
-                        printk(KERN_DEBUG "RX beacon SA=" MAC_FMT " BSSID="
-                               MAC_FMT " TSF=0x%llx BCN=0x%llx diff=%lld "
+                        printk(KERN_DEBUG "RX beacon SA=%s BSSID="
+                               "%s TSF=0x%llx BCN=0x%llx diff=%lld "
                                "@%lu\n",
-                               MAC_ARG(mgmt->sa), MAC_ARG(mgmt->bssid),
+                               print_mac(mac, mgmt->sa), print_mac(mac2, mgmt->bssid),
                                (unsigned long long)tsf,
                                (unsigned long long)timestamp,
                                (unsigned long long)(tsf - timestamp),
@@ -1518,9 +1530,9 @@ static void ieee80211_rx_bss_info(struct net_device *dev,
                 }
                 if (sta->supp_rates != prev_rates) {
                         printk(KERN_DEBUG "%s: updated supp_rates set for "
-                               MAC_FMT " based on beacon info (0x%x & 0x%x -> "
+                               "%s based on beacon info (0x%x & 0x%x -> "
                                "0x%x)\n",
-                               dev->name, MAC_ARG(sta->addr), prev_rates,
+                               dev->name, print_mac(mac, sta->addr), prev_rates,
                                supp_rates, sta->supp_rates);
                 }
                 sta_info_put(sta);
@@ -1722,6 +1734,11 @@ static void ieee80211_rx_mgmt_probe_req(struct net_device *dev,
         struct sk_buff *skb;
         struct ieee80211_mgmt *resp;
         u8 *pos, *end;
+        DECLARE_MAC_BUF(mac);
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+        DECLARE_MAC_BUF(mac2);
+        DECLARE_MAC_BUF(mac3);
+#endif
 
         if (sdata->type != IEEE80211_IF_TYPE_IBSS ||
             ifsta->state != IEEE80211_IBSS_JOINED ||
@@ -1734,10 +1751,10 @@ static void ieee80211_rx_mgmt_probe_req(struct net_device *dev,
                 tx_last_beacon = 1;
 
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
-        printk(KERN_DEBUG "%s: RX ProbeReq SA=" MAC_FMT " DA=" MAC_FMT " BSSID="
-               MAC_FMT " (tx_last_beacon=%d)\n",
-               dev->name, MAC_ARG(mgmt->sa), MAC_ARG(mgmt->da),
-               MAC_ARG(mgmt->bssid), tx_last_beacon);
+        printk(KERN_DEBUG "%s: RX ProbeReq SA=%s DA=%s BSSID="
+               "%s (tx_last_beacon=%d)\n",
+               dev->name, print_mac(mac, mgmt->sa), print_mac(mac2, mgmt->da),
+               print_mac(mac3, mgmt->bssid), tx_last_beacon);
 #endif /* CONFIG_MAC80211_IBSS_DEBUG */
 
         if (!tx_last_beacon)
@@ -1753,8 +1770,8 @@ static void ieee80211_rx_mgmt_probe_req(struct net_device *dev,
             pos + 2 + pos[1] > end) {
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG "%s: Invalid SSID IE in ProbeReq "
-                               "from " MAC_FMT "\n",
-                               dev->name, MAC_ARG(mgmt->sa));
+                               "from %s\n",
+                               dev->name, print_mac(mac, mgmt->sa));
                 }
                 return;
         }
@@ -1773,8 +1790,8 @@ static void ieee80211_rx_mgmt_probe_req(struct net_device *dev,
         resp = (struct ieee80211_mgmt *) skb->data;
         memcpy(resp->da, mgmt->sa, ETH_ALEN);
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
-        printk(KERN_DEBUG "%s: Sending ProbeResp to " MAC_FMT "\n",
-               dev->name, MAC_ARG(resp->da));
+        printk(KERN_DEBUG "%s: Sending ProbeResp to %s\n",
+               dev->name, print_mac(mac, resp->da));
 #endif /* CONFIG_MAC80211_IBSS_DEBUG */
         ieee80211_sta_tx(dev, skb, 0);
 }
@@ -1925,13 +1942,14 @@ static void ieee80211_sta_expire(struct net_device *dev)
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
         struct sta_info *sta, *tmp;
         LIST_HEAD(tmp_list);
+        DECLARE_MAC_BUF(mac);
 
         write_lock_bh(&local->sta_lock);
         list_for_each_entry_safe(sta, tmp, &local->sta_list, list)
                 if (time_after(jiffies, sta->last_rx +
                                IEEE80211_IBSS_INACTIVITY_LIMIT)) {
-                        printk(KERN_DEBUG "%s: expiring inactive STA " MAC_FMT
-                               "\n", dev->name, MAC_ARG(sta->addr));
+                        printk(KERN_DEBUG "%s: expiring inactive STA %s\n",
+                               dev->name, print_mac(mac, sta->addr));
                         __sta_info_get(sta);
                         sta_info_remove(sta);
                         list_add(&sta->list, &tmp_list);
@@ -2362,6 +2380,7 @@ static int ieee80211_sta_create_ibss(struct net_device *dev,
         struct ieee80211_hw_mode *mode;
         u8 bssid[ETH_ALEN], *pos;
         int i;
+        DECLARE_MAC_BUF(mac);
 
 #if 0
         /* Easier testing, use fixed BSSID. */
@@ -2377,8 +2396,8 @@ static int ieee80211_sta_create_ibss(struct net_device *dev,
         bssid[0] |= 0x02;
 #endif
 
-        printk(KERN_DEBUG "%s: Creating new IBSS network, BSSID " MAC_FMT "\n",
-               dev->name, MAC_ARG(bssid));
+        printk(KERN_DEBUG "%s: Creating new IBSS network, BSSID %s\n",
+               dev->name, print_mac(mac, bssid));
 
         bss = ieee80211_rx_bss_add(dev, bssid);
         if (!bss)
@@ -2418,6 +2437,8 @@ static int ieee80211_sta_find_ibss(struct net_device *dev,
         int found = 0;
         u8 bssid[ETH_ALEN];
         int active_ibss;
+        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mac2);
 
         if (ifsta->ssid_len == 0)
                 return -EINVAL;
@@ -2434,8 +2455,8 @@ static int ieee80211_sta_find_ibss(struct net_device *dev,
                     || !(bss->capability & WLAN_CAPABILITY_IBSS))
                         continue;
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
-                printk(KERN_DEBUG "   bssid=" MAC_FMT " found\n",
-                       MAC_ARG(bss->bssid));
+                printk(KERN_DEBUG "   bssid=%s found\n",
+                       print_mac(mac, bss->bssid));
 #endif /* CONFIG_MAC80211_IBSS_DEBUG */
                 memcpy(bssid, bss->bssid, ETH_ALEN);
                 found = 1;
@@ -2445,14 +2466,14 @@ static int ieee80211_sta_find_ibss(struct net_device *dev,
         spin_unlock_bh(&local->sta_bss_lock);
 
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
-        printk(KERN_DEBUG "   sta_find_ibss: selected " MAC_FMT " current "
-               MAC_FMT "\n", MAC_ARG(bssid), MAC_ARG(ifsta->bssid));
+        printk(KERN_DEBUG "   sta_find_ibss: selected %s current "
+               "%s\n", print_mac(mac, bssid), print_mac(mac2, ifsta->bssid));
 #endif /* CONFIG_MAC80211_IBSS_DEBUG */
         if (found && memcmp(ifsta->bssid, bssid, ETH_ALEN) != 0 &&
             (bss = ieee80211_rx_bss_get(dev, bssid))) {
-                printk(KERN_DEBUG "%s: Selected IBSS BSSID " MAC_FMT
+                printk(KERN_DEBUG "%s: Selected IBSS BSSID %s"
                        " based on configured SSID\n",
-                       dev->name, MAC_ARG(bssid));
+                       dev->name, print_mac(mac, bssid));
                 return ieee80211_sta_join_ibss(dev, ifsta, bss);
         }
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
@@ -3070,19 +3091,20 @@ struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev,
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
         struct sta_info *sta;
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        DECLARE_MAC_BUF(mac);
 
         /* TODO: Could consider removing the least recently used entry and
          * allow new one to be added. */
         if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG "%s: No room for a new IBSS STA "
-                               "entry " MAC_FMT "\n", dev->name, MAC_ARG(addr));
+                               "entry %s\n", dev->name, print_mac(mac, addr));
                 }
                 return NULL;
         }
 
-        printk(KERN_DEBUG "%s: Adding new IBSS station " MAC_FMT " (dev=%s)\n",
-               local->mdev->name, MAC_ARG(addr), dev->name);
+        printk(KERN_DEBUG "%s: Adding new IBSS station %s (dev=%s)\n",
+               local->mdev->name, print_mac(mac, addr), dev->name);
 
         sta = sta_info_add(local, dev, addr, GFP_ATOMIC);
         if (!sta)
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index dd6fc4aa3ff5..c10e53afbb4f 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -63,6 +63,7 @@ static void ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
 {
         const u8 *addr;
         int ret;
+        DECLARE_MAC_BUF(mac);
 
         if (!key->local->ops->set_key)
                 return;
@@ -78,15 +79,16 @@ static void ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
 
         if (ret && ret != -ENOSPC && ret != -EOPNOTSUPP)
                 printk(KERN_ERR "mac80211-%s: failed to set key "
-                       "(%d, " MAC_FMT ") to hardware (%d)\n",
+                       "(%d, %s) to hardware (%d)\n",
                        wiphy_name(key->local->hw.wiphy),
-                       key->conf.keyidx, MAC_ARG(addr), ret);
+                       key->conf.keyidx, print_mac(mac, addr), ret);
 }
 
 static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key)
 {
         const u8 *addr;
         int ret;
+        DECLARE_MAC_BUF(mac);
 
         if (!key->local->ops->set_key)
                 return;
@@ -102,9 +104,9 @@ static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key)
 
         if (ret)
                 printk(KERN_ERR "mac80211-%s: failed to remove key "
-                       "(%d, " MAC_FMT ") from hardware (%d)\n",
+                       "(%d, %s) from hardware (%d)\n",
                        wiphy_name(key->local->hw.wiphy),
-                       key->conf.keyidx, MAC_ARG(addr), ret);
+                       key->conf.keyidx, print_mac(mac, addr), ret);
 
         key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE;
 }
diff --git a/net/mac80211/rc80211_simple.c b/net/mac80211/rc80211_simple.c
index ef91ce428aca..314b8de88862 100644
--- a/net/mac80211/rc80211_simple.c
+++ b/net/mac80211/rc80211_simple.c
@@ -201,9 +201,10 @@ static void rate_control_simple_tx_status(void *priv, struct net_device *dev,
                 srctrl->avg_rate_update = jiffies;
                 if (srctrl->tx_avg_rate_num > 0) {
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                        printk(KERN_DEBUG "%s: STA " MAC_FMT " Average rate: "
+                        DECLARE_MAC_BUF(mac);
+                        printk(KERN_DEBUG "%s: STA %s Average rate: "
                                "%d (%d/%d)\n",
-                               dev->name, MAC_ARG(sta->addr),
+                               dev->name, print_mac(mac, sta->addr),
                                srctrl->tx_avg_rate_sum /
                                srctrl->tx_avg_rate_num,
                                srctrl->tx_avg_rate_sum,
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index c985c7a537db..e9dcc6229c3c 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -403,6 +403,8 @@ ieee80211_rx_h_load_key(struct ieee80211_txrx_data *rx)
 static void ap_sta_ps_start(struct net_device *dev, struct sta_info *sta)
 {
         struct ieee80211_sub_if_data *sdata;
+        DECLARE_MAC_BUF(mac);
+
         sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
 
         if (sdata->bss)
@@ -410,8 +412,8 @@ static void ap_sta_ps_start(struct net_device *dev, struct sta_info *sta)
         sta->flags |= WLAN_STA_PS;
         sta->pspoll = 0;
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-        printk(KERN_DEBUG "%s: STA " MAC_FMT " aid %d enters power "
-               "save mode\n", dev->name, MAC_ARG(sta->addr), sta->aid);
+        printk(KERN_DEBUG "%s: STA %s aid %d enters power save mode\n",
+               dev->name, print_mac(mac, sta->addr), sta->aid);
 #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
 }
 
@@ -422,6 +424,7 @@ static int ap_sta_ps_end(struct net_device *dev, struct sta_info *sta)
         int sent = 0;
         struct ieee80211_sub_if_data *sdata;
         struct ieee80211_tx_packet_data *pkt_data;
+        DECLARE_MAC_BUF(mac);
 
         sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
         if (sdata->bss)
@@ -435,8 +438,8 @@ static int ap_sta_ps_end(struct net_device *dev, struct sta_info *sta)
                         bss_tim_clear(local, sdata->bss, sta->aid);
         }
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-        printk(KERN_DEBUG "%s: STA " MAC_FMT " aid %d exits power "
-               "save mode\n", dev->name, MAC_ARG(sta->addr), sta->aid);
+        printk(KERN_DEBUG "%s: STA %s aid %d exits power save mode\n",
+               dev->name, print_mac(mac, sta->addr), sta->aid);
 #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
         /* Send all buffered frames to the station */
         while ((skb = skb_dequeue(&sta->tx_filtered)) != NULL) {
@@ -450,9 +453,9 @@ static int ap_sta_ps_end(struct net_device *dev, struct sta_info *sta)
                 local->total_ps_buffered--;
                 sent++;
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-                printk(KERN_DEBUG "%s: STA " MAC_FMT " aid %d send PS frame "
+                printk(KERN_DEBUG "%s: STA %s aid %d send PS frame "
                        "since STA not sleeping anymore\n", dev->name,
-                       MAC_ARG(sta->addr), sta->aid);
+                       print_mac(mac, sta->addr), sta->aid);
 #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
                 pkt_data->flags |= IEEE80211_TXPD_REQUEUE;
                 dev_queue_xmit(skb);
@@ -590,13 +593,15 @@ ieee80211_reassemble_add(struct ieee80211_sub_if_data *sdata,
 #ifdef CONFIG_MAC80211_DEBUG
                 struct ieee80211_hdr *hdr =
                         (struct ieee80211_hdr *) entry->skb_list.next->data;
+                DECLARE_MAC_BUF(mac);
+                DECLARE_MAC_BUF(mac2);
                 printk(KERN_DEBUG "%s: RX reassembly removed oldest "
                        "fragment entry (idx=%d age=%lu seq=%d last_frag=%d "
-                       "addr1=" MAC_FMT " addr2=" MAC_FMT "\n",
+                       "addr1=%s addr2=%s\n",
                        sdata->dev->name, idx,
                        jiffies - entry->first_frag_time, entry->seq,
-                       entry->last_frag, MAC_ARG(hdr->addr1),
-                       MAC_ARG(hdr->addr2));
+                       entry->last_frag, print_mac(mac, hdr->addr1),
+                       print_mac(mac2, hdr->addr2));
 #endif /* CONFIG_MAC80211_DEBUG */
                 __skb_queue_purge(&entry->skb_list);
         }
@@ -662,6 +667,7 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx)
         unsigned int frag, seq;
         struct ieee80211_fragment_entry *entry;
         struct sk_buff *skb;
+        DECLARE_MAC_BUF(mac);
 
         hdr = (struct ieee80211_hdr *) rx->skb->data;
         sc = le16_to_cpu(hdr->seq_ctrl);
@@ -720,10 +726,10 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx)
                 if (memcmp(pn, rpn, CCMP_PN_LEN) != 0) {
                         if (net_ratelimit())
                                 printk(KERN_DEBUG "%s: defrag: CCMP PN not "
-                                       "sequential A2=" MAC_FMT
+                                       "sequential A2=%s"
                                        " PN=%02x%02x%02x%02x%02x%02x "
                                        "(expected %02x%02x%02x%02x%02x%02x)\n",
-                                       rx->dev->name, MAC_ARG(hdr->addr2),
+                                       rx->dev->name, print_mac(mac, hdr->addr2),
                                        rpn[0], rpn[1], rpn[2], rpn[3], rpn[4],
                                        rpn[5], pn[0], pn[1], pn[2], pn[3],
                                        pn[4], pn[5]);
@@ -774,6 +780,7 @@ ieee80211_rx_h_ps_poll(struct ieee80211_txrx_data *rx)
 {
         struct sk_buff *skb;
         int no_pending_pkts;
+        DECLARE_MAC_BUF(mac);
 
         if (likely(!rx->sta ||
                    (rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_CTL ||
@@ -799,9 +806,8 @@ ieee80211_rx_h_ps_poll(struct ieee80211_txrx_data *rx)
                 rx->sta->pspoll = 1;
 
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-                printk(KERN_DEBUG "STA " MAC_FMT " aid %d: PS Poll (entries "
-                       "after %d)\n",
-                       MAC_ARG(rx->sta->addr), rx->sta->aid,
+                printk(KERN_DEBUG "STA %s aid %d: PS Poll (entries after %d)\n",
+                       print_mac(mac, rx->sta->addr), rx->sta->aid,
                        skb_queue_len(&rx->sta->ps_tx_buf));
 #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
 
@@ -824,9 +830,9 @@ ieee80211_rx_h_ps_poll(struct ieee80211_txrx_data *rx)
                 }
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
         } else if (!rx->u.rx.sent_ps_buffered) {
-                printk(KERN_DEBUG "%s: STA " MAC_FMT " sent PS Poll even "
+                printk(KERN_DEBUG "%s: STA %s sent PS Poll even "
                        "though there is no buffered frames for it\n",
-                       rx->dev->name, MAC_ARG(rx->sta->addr));
+                       rx->dev->name, print_mac(mac, rx->sta->addr));
 #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
 
         }
@@ -881,9 +887,10 @@ ieee80211_rx_h_802_1x_pae(struct ieee80211_txrx_data *rx)
 #ifdef CONFIG_MAC80211_DEBUG
                 struct ieee80211_hdr *hdr =
                         (struct ieee80211_hdr *) rx->skb->data;
-                printk(KERN_DEBUG "%s: dropped frame from " MAC_FMT
+                DECLARE_MAC_BUF(mac);
+                printk(KERN_DEBUG "%s: dropped frame from %s"
                        " (unauthorized port)\n", rx->dev->name,
-                       MAC_ARG(hdr->addr2));
+                       print_mac(mac, hdr->addr2));
 #endif /* CONFIG_MAC80211_DEBUG */
                 return TXRX_DROP;
         }
@@ -928,6 +935,10 @@ ieee80211_rx_h_data(struct ieee80211_txrx_data *rx)
         u8 src[ETH_ALEN];
         struct sk_buff *skb = rx->skb, *skb2;
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mac2);
+        DECLARE_MAC_BUF(mac3);
+        DECLARE_MAC_BUF(mac4);
 
         fc = rx->fc;
         if (unlikely((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA))
@@ -958,13 +969,11 @@ ieee80211_rx_h_data(struct ieee80211_txrx_data *rx)
                              sdata->type != IEEE80211_IF_TYPE_VLAN)) {
                         if (net_ratelimit())
                                 printk(KERN_DEBUG "%s: dropped ToDS frame "
-                                       "(BSSID=" MAC_FMT
-                                       " SA=" MAC_FMT
-                                       " DA=" MAC_FMT ")\n",
+                                       "(BSSID=%s SA=%s DA=%s)\n",
                                        dev->name,
-                                       MAC_ARG(hdr->addr1),
-                                       MAC_ARG(hdr->addr2),
-                                       MAC_ARG(hdr->addr3));
+                                       print_mac(mac, hdr->addr1),
+                                       print_mac(mac2, hdr->addr2),
+                                       print_mac(mac3, hdr->addr3));
                         return TXRX_DROP;
                 }
                 break;
@@ -976,14 +985,12 @@ ieee80211_rx_h_data(struct ieee80211_txrx_data *rx)
                 if (unlikely(sdata->type != IEEE80211_IF_TYPE_WDS)) {
                         if (net_ratelimit())
                                 printk(KERN_DEBUG "%s: dropped FromDS&ToDS "
-                                       "frame (RA=" MAC_FMT
-                                       " TA=" MAC_FMT " DA=" MAC_FMT
-                                       " SA=" MAC_FMT ")\n",
+                                       "frame (RA=%s TA=%s DA=%s SA=%s)\n",
                                        rx->dev->name,
-                                       MAC_ARG(hdr->addr1),
-                                       MAC_ARG(hdr->addr2),
-                                       MAC_ARG(hdr->addr3),
-                                       MAC_ARG(hdr->addr4));
+                                       print_mac(mac, hdr->addr1),
+                                       print_mac(mac2, hdr->addr2),
+                                       print_mac(mac3, hdr->addr3),
+                                       print_mac(mac4, hdr->addr4));
                         return TXRX_DROP;
                 }
                 break;
@@ -1004,12 +1011,12 @@ ieee80211_rx_h_data(struct ieee80211_txrx_data *rx)
 
                 if (sdata->type != IEEE80211_IF_TYPE_IBSS) {
                         if (net_ratelimit()) {
-                                printk(KERN_DEBUG "%s: dropped IBSS frame (DA="
-                                       MAC_FMT " SA=" MAC_FMT " BSSID=" MAC_FMT
-                                       ")\n",
-                                       dev->name, MAC_ARG(hdr->addr1),
-                                       MAC_ARG(hdr->addr2),
-                                       MAC_ARG(hdr->addr3));
+                                printk(KERN_DEBUG "%s: dropped IBSS frame "
+                                       "(DA=%s SA=%s BSSID=%s)\n",
+                                       dev->name,
+                                       print_mac(mac, hdr->addr1),
+                                       print_mac(mac2, hdr->addr2),
+                                       print_mac(mac3, hdr->addr3));
                         }
                         return TXRX_DROP;
                 }
@@ -1172,6 +1179,8 @@ static void ieee80211_rx_michael_mic_report(struct net_device *dev,
                                             struct ieee80211_txrx_data *rx)
 {
         int keyidx, hdrlen;
+        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mac2);
 
         hdrlen = ieee80211_get_hdrlen_from_skb(rx->skb);
         if (rx->skb->len >= hdrlen + 4)
@@ -1181,9 +1190,9 @@ static void ieee80211_rx_michael_mic_report(struct net_device *dev,
 
         if (net_ratelimit())
                 printk(KERN_DEBUG "%s: TKIP hwaccel reported Michael MIC "
-                       "failure from " MAC_FMT " to " MAC_FMT " keyidx=%d\n",
-                       dev->name, MAC_ARG(hdr->addr2), MAC_ARG(hdr->addr1),
-                       keyidx);
+                       "failure from %s to %s keyidx=%d\n",
+                       dev->name, print_mac(mac, hdr->addr2),
+                       print_mac(mac2, hdr->addr1), keyidx);
 
         if (!sta) {
                 /*
@@ -1192,8 +1201,8 @@ static void ieee80211_rx_michael_mic_report(struct net_device *dev,
                  */
                 if (net_ratelimit())
                         printk(KERN_DEBUG "%s: ignored spurious Michael MIC "
-                               "error for unknown address " MAC_FMT "\n",
-                               dev->name, MAC_ARG(hdr->addr2));
+                               "error for unknown address %s\n",
+                               dev->name, print_mac(mac, hdr->addr2));
                 goto ignore;
         }
 
@@ -1201,7 +1210,7 @@ static void ieee80211_rx_michael_mic_report(struct net_device *dev,
                 if (net_ratelimit())
                         printk(KERN_DEBUG "%s: ignored spurious Michael MIC "
                                "error for a frame with no PROTECTED flag (src "
-                               MAC_FMT ")\n", dev->name, MAC_ARG(hdr->addr2));
+                               "%s)\n", dev->name, print_mac(mac, hdr->addr2));
                 goto ignore;
         }
 
@@ -1215,8 +1224,8 @@ static void ieee80211_rx_michael_mic_report(struct net_device *dev,
                 if (net_ratelimit())
                         printk(KERN_DEBUG "%s: ignored Michael MIC error for "
                                "a frame with non-zero keyidx (%d)"
-                               " (src " MAC_FMT ")\n", dev->name, keyidx,
-                               MAC_ARG(hdr->addr2));
+                               " (src %s)\n", dev->name, keyidx,
+                               print_mac(mac, hdr->addr2));
                 goto ignore;
         }
 
@@ -1226,8 +1235,8 @@ static void ieee80211_rx_michael_mic_report(struct net_device *dev,
                 if (net_ratelimit())
                         printk(KERN_DEBUG "%s: ignored spurious Michael MIC "
                                "error for a frame that cannot be encrypted "
-                               "(fc=0x%04x) (src " MAC_FMT ")\n",
-                               dev->name, rx->fc, MAC_ARG(hdr->addr2));
+                               "(fc=0x%04x) (src %s)\n",
+                               dev->name, rx->fc, print_mac(mac, hdr->addr2));
                 goto ignore;
         }
 
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index c17172abb21c..44d983404952 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -132,6 +132,7 @@ struct sta_info * sta_info_add(struct ieee80211_local *local,
                                struct net_device *dev, u8 *addr, gfp_t gfp)
 {
         struct sta_info *sta;
+        DECLARE_MAC_BUF(mac);
 
         sta = kzalloc(sizeof(*sta), gfp);
         if (!sta)
@@ -164,8 +165,8 @@ struct sta_info * sta_info_add(struct ieee80211_local *local,
         write_unlock_bh(&local->sta_lock);
 
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        printk(KERN_DEBUG "%s: Added STA " MAC_FMT "\n",
-               local->mdev->name, MAC_ARG(addr));
+        printk(KERN_DEBUG "%s: Added STA %s\n",
+               local->mdev->name, print_mac(mac, addr));
 #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
 
 #ifdef CONFIG_MAC80211_DEBUGFS
@@ -207,6 +208,7 @@ void sta_info_free(struct sta_info *sta)
 {
         struct sk_buff *skb;
         struct ieee80211_local *local = sta->local;
+        DECLARE_MAC_BUF(mac);
 
         might_sleep();
 
@@ -223,8 +225,8 @@ void sta_info_free(struct sta_info *sta)
         }
 
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        printk(KERN_DEBUG "%s: Removed STA " MAC_FMT "\n",
-               local->mdev->name, MAC_ARG(sta->addr));
+        printk(KERN_DEBUG "%s: Removed STA %s\n",
+               local->mdev->name, print_mac(mac, sta->addr));
 #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
 
         ieee80211_key_free(sta->key);
@@ -263,6 +265,7 @@ static void sta_info_cleanup_expire_buffered(struct ieee80211_local *local,
 {
         unsigned long flags;
         struct sk_buff *skb;
+        DECLARE_MAC_BUF(mac);
 
         if (skb_queue_empty(&sta->ps_tx_buf))
                 return;
@@ -281,7 +284,7 @@ static void sta_info_cleanup_expire_buffered(struct ieee80211_local *local,
                 if (skb) {
                         local->total_ps_buffered--;
                         printk(KERN_DEBUG "Buffered frame expired (STA "
-                               MAC_FMT ")\n", MAC_ARG(sta->addr));
+                               "%s)\n", print_mac(mac, sta->addr));
                         dev_kfree_skb(skb);
                 } else
                         break;
diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c
index b9c1d5405180..5b11f14abfba 100644
--- a/net/mac80211/tkip.c
+++ b/net/mac80211/tkip.c
@@ -275,9 +275,10 @@ int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm,
              (iv32 == key->u.tkip.iv32_rx[queue] &&
               iv16 <= key->u.tkip.iv16_rx[queue]))) {
 #ifdef CONFIG_TKIP_DEBUG
+                DECLARE_MAC_BUF(mac);
                 printk(KERN_DEBUG "TKIP replay detected for RX frame from "
-                       MAC_FMT " (RX IV (%04x,%02x) <= prev. IV (%04x,%02x)\n",
-                       MAC_ARG(ta),
+                       "%s (RX IV (%04x,%02x) <= prev. IV (%04x,%02x)\n",
+                       print_mac(mac, ta),
                        iv32, iv16, key->u.tkip.iv32_rx[queue],
                        key->u.tkip.iv16_rx[queue]);
 #endif /* CONFIG_TKIP_DEBUG */
@@ -299,8 +300,9 @@ int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm,
 #ifdef CONFIG_TKIP_DEBUG
                 {
                         int i;
-                        printk(KERN_DEBUG "TKIP decrypt: Phase1 TA=" MAC_FMT
-                               " TK=", MAC_ARG(ta));
+                        DECLARE_MAC_BUF(mac);
+                        printk(KERN_DEBUG "TKIP decrypt: Phase1 TA=%s"
+                               " TK=", print_mac(mac, ta));
                         for (i = 0; i < 16; i++)
                                 printk("%02x ",
                                        key->conf.key[
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index ca262a99e56f..04b4fa9c69ea 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -54,6 +54,7 @@ static void ieee80211_dump_frame(const char *ifname, const char *title,
         const struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
         u16 fc;
         int hdrlen;
+        DECLARE_MAC_BUF(mac);
 
         printk(KERN_DEBUG "%s: %s (len=%d)", ifname, title, skb->len);
         if (skb->len < 4) {
@@ -69,13 +70,13 @@ static void ieee80211_dump_frame(const char *ifname, const char *title,
                 printk(" FC=0x%04x DUR=0x%04x",
                        fc, le16_to_cpu(hdr->duration_id));
         if (hdrlen >= 10)
-                printk(" A1=" MAC_FMT, MAC_ARG(hdr->addr1));
+                printk(" A1=%s", print_mac(mac, hdr->addr1));
         if (hdrlen >= 16)
-                printk(" A2=" MAC_FMT, MAC_ARG(hdr->addr2));
+                printk(" A2=%s", print_mac(mac, hdr->addr2));
         if (hdrlen >= 24)
-                printk(" A3=" MAC_FMT, MAC_ARG(hdr->addr3));
+                printk(" A3=%s", print_mac(mac, hdr->addr3));
         if (hdrlen >= 30)
-                printk(" A4=" MAC_FMT, MAC_ARG(hdr->addr4));
+                printk(" A4=%s", print_mac(mac, hdr->addr4));
         printk("\n");
 }
 #else /* CONFIG_MAC80211_LOWTX_FRAME_DUMP */
@@ -236,9 +237,10 @@ ieee80211_tx_h_check_assoc(struct ieee80211_txrx_data *tx)
                              tx->sdata->type != IEEE80211_IF_TYPE_IBSS &&
                              (tx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA)) {
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+                        DECLARE_MAC_BUF(mac);
                         printk(KERN_DEBUG "%s: dropped data frame to not "
-                               "associated station " MAC_FMT "\n",
-                               tx->dev->name, MAC_ARG(hdr->addr1));
+                               "associated station %s\n",
+                               tx->dev->name, print_mac(mac, hdr->addr1));
 #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
                         I802_DEBUG_INC(tx->local->tx_handlers_drop_not_assoc);
                         return TXRX_DROP;
@@ -259,9 +261,10 @@ ieee80211_tx_h_check_assoc(struct ieee80211_txrx_data *tx)
         if (unlikely(!tx->u.tx.mgmt_interface && tx->sdata->ieee802_1x &&
                      !(sta_flags & WLAN_STA_AUTHORIZED))) {
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                printk(KERN_DEBUG "%s: dropped frame to " MAC_FMT
+                DECLARE_MAC_BUF(mac);
+                printk(KERN_DEBUG "%s: dropped frame to %s"
                        " (unauthorized port)\n", tx->dev->name,
-                       MAC_ARG(hdr->addr1));
+                       print_mac(mac, hdr->addr1));
 #endif
                 I802_DEBUG_INC(tx->local->tx_handlers_drop_unauth_port);
                 return TXRX_DROP;
@@ -357,6 +360,7 @@ static inline ieee80211_txrx_result
 ieee80211_tx_h_unicast_ps_buf(struct ieee80211_txrx_data *tx)
 {
         struct sta_info *sta = tx->sta;
+        DECLARE_MAC_BUF(mac);
 
         if (unlikely(!sta ||
                      ((tx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT &&
@@ -366,9 +370,9 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_txrx_data *tx)
         if (unlikely((sta->flags & WLAN_STA_PS) && !sta->pspoll)) {
                 struct ieee80211_tx_packet_data *pkt_data;
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-                printk(KERN_DEBUG "STA " MAC_FMT " aid %d: PS buffer (entries "
+                printk(KERN_DEBUG "STA %s aid %d: PS buffer (entries "
                        "before %d)\n",
-                       MAC_ARG(sta->addr), sta->aid,
+                       print_mac(mac, sta->addr), sta->aid,
                        skb_queue_len(&sta->ps_tx_buf));
 #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
                 sta->flags |= WLAN_STA_TIM;
@@ -377,9 +381,9 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_txrx_data *tx)
                 if (skb_queue_len(&sta->ps_tx_buf) >= STA_MAX_TX_BUFFER) {
                         struct sk_buff *old = skb_dequeue(&sta->ps_tx_buf);
                         if (net_ratelimit()) {
-                                printk(KERN_DEBUG "%s: STA " MAC_FMT " TX "
+                                printk(KERN_DEBUG "%s: STA %s TX "
                                        "buffer full - dropping oldest frame\n",
-                                       tx->dev->name, MAC_ARG(sta->addr));
+                                       tx->dev->name, print_mac(mac, sta->addr));
                         }
                         dev_kfree_skb(old);
                 } else
@@ -399,9 +403,9 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_txrx_data *tx)
         }
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
         else if (unlikely(sta->flags & WLAN_STA_PS)) {
-                printk(KERN_DEBUG "%s: STA " MAC_FMT " in PS mode, but pspoll "
+                printk(KERN_DEBUG "%s: STA %s in PS mode, but pspoll "
                        "set -> send frame\n", tx->dev->name,
-                       MAC_ARG(sta->addr));
+                       print_mac(mac, sta->addr));
         }
 #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
         sta->pspoll = 0;
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c
index 6e12638054aa..360d11e9de15 100644
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
@@ -132,6 +132,7 @@ ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx)
         u8 mic[MICHAEL_MIC_LEN];
         struct sk_buff *skb = rx->skb;
         int authenticator = 1, wpa_test = 0;
+        DECLARE_MAC_BUF(mac);
 
         fc = rx->fc;
 
@@ -164,7 +165,7 @@ ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx)
                         return TXRX_DROP;
 
                 printk(KERN_DEBUG "%s: invalid Michael MIC in data frame from "
-                       MAC_FMT "\n", rx->dev->name, MAC_ARG(sa));
+                       "%s\n", rx->dev->name, print_mac(mac, sa));
 
                 mac80211_ev_michael_mic_failure(rx->dev, rx->key->conf.keyidx,
                                                 (void *) skb->data);
@@ -287,6 +288,7 @@ ieee80211_rx_h_tkip_decrypt(struct ieee80211_txrx_data *rx)
         int hdrlen, res, hwaccel = 0, wpa_test = 0;
         struct ieee80211_key *key = rx->key;
         struct sk_buff *skb = rx->skb;
+        DECLARE_MAC_BUF(mac);
 
         fc = le16_to_cpu(hdr->frame_control);
         hdrlen = ieee80211_get_hdrlen(fc);
@@ -319,8 +321,8 @@ ieee80211_rx_h_tkip_decrypt(struct ieee80211_txrx_data *rx)
                                           hwaccel, rx->u.rx.queue);
         if (res != TKIP_DECRYPT_OK || wpa_test) {
                 printk(KERN_DEBUG "%s: TKIP decrypt failed for RX frame from "
-                       MAC_FMT " (res=%d)\n",
-                       rx->dev->name, MAC_ARG(rx->sta->addr), res);
+                       "%s (res=%d)\n",
+                       rx->dev->name, print_mac(mac, rx->sta->addr), res);
                 return TXRX_DROP;
         }
 
@@ -542,6 +544,7 @@ ieee80211_rx_h_ccmp_decrypt(struct ieee80211_txrx_data *rx)
         struct sk_buff *skb = rx->skb;
         u8 pn[CCMP_PN_LEN];
         int data_len;
+        DECLARE_MAC_BUF(mac);
 
         fc = le16_to_cpu(hdr->frame_control);
         hdrlen = ieee80211_get_hdrlen(fc);
@@ -564,10 +567,11 @@ ieee80211_rx_h_ccmp_decrypt(struct ieee80211_txrx_data *rx)
         if (memcmp(pn, key->u.ccmp.rx_pn[rx->u.rx.queue], CCMP_PN_LEN) <= 0) {
 #ifdef CONFIG_MAC80211_DEBUG
                 u8 *ppn = key->u.ccmp.rx_pn[rx->u.rx.queue];
+
                 printk(KERN_DEBUG "%s: CCMP replay detected for RX frame from "
-                       MAC_FMT " (RX PN %02x%02x%02x%02x%02x%02x <= prev. PN "
+                       "%s (RX PN %02x%02x%02x%02x%02x%02x <= prev. PN "
                        "%02x%02x%02x%02x%02x%02x)\n", rx->dev->name,
-                       MAC_ARG(rx->sta->addr),
+                       print_mac(mac, rx->sta->addr),
                        pn[0], pn[1], pn[2], pn[3], pn[4], pn[5],
                        ppn[0], ppn[1], ppn[2], ppn[3], ppn[4], ppn[5]);
 #endif /* CONFIG_MAC80211_DEBUG */
@@ -591,8 +595,8 @@ ieee80211_rx_h_ccmp_decrypt(struct ieee80211_txrx_data *rx)
                             skb->data + skb->len - CCMP_MIC_LEN,
                             skb->data + hdrlen + CCMP_HDR_LEN)) {
                         printk(KERN_DEBUG "%s: CCMP decrypt failed for RX "
-                               "frame from " MAC_FMT "\n", rx->dev->name,
-                               MAC_ARG(rx->sta->addr));
+                               "frame from %s\n", rx->dev->name,
+                               print_mac(mac, rx->sta->addr));
                         return TXRX_DROP;
                 }
         }
@@ -606,4 +610,3 @@ ieee80211_rx_h_ccmp_decrypt(struct ieee80211_txrx_data *rx)
 
         return TXRX_CONTINUE;
 }
-
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index d6fc0575816b..1a99e2947145 100644
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -243,12 +243,12 @@ static int recv_notification(struct notifier_block *nb, unsigned long evt,
 static char *eth_addr2str(struct tipc_media_addr *a, char *str_buf, int str_size)
 {
         unchar *addr = (unchar *)&a->dev_addr;
+        DECLARE_MAC_BUF(mac);
 
         if (str_size < 18)
                 *str_buf = '\0';
         else
-                sprintf(str_buf, "%02x:%02x:%02x:%02x:%02x:%02x",
-                        addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+                sprintf(str_buf, "%s", print_mac(mac, addr));
         return str_buf;
 }