1 files changed, 15 insertions, 13 deletions

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)