8 files changed, 123 insertions, 162 deletions

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) {