aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/atarilance.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2007-10-03 20:59:30 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:51:42 -0400
commit0795af5729b18218767fab27c44b1384f72dc9ad (patch)
tree67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/atarilance.c
parent95ea36275f3c9a1d3d04c217b4b576c657c4e70e (diff)
[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>
Diffstat (limited to 'drivers/net/atarilance.c')
-rw-r--r--drivers/net/atarilance.c43
1 files changed, 20 insertions, 23 deletions
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,
467 int i; 467 int i;
468 static int did_version; 468 static int did_version;
469 unsigned short save1, save2; 469 unsigned short save1, save2;
470 DECLARE_MAC_BUF(mac);
470 471
471 PROBE_PRINT(( "Probing for Lance card at mem %#lx io %#lx\n", 472 PROBE_PRINT(( "Probing for Lance card at mem %#lx io %#lx\n",
472 (long)memaddr, (long)ioaddr )); 473 (long)memaddr, (long)ioaddr ));
@@ -595,8 +596,7 @@ static unsigned long __init lance_probe1( struct net_device *dev,
595 i = IO->mem; 596 i = IO->mem;
596 break; 597 break;
597 } 598 }
598 for( i = 0; i < 6; ++i ) 599 printk("%s\n", print_mac(mac, dev->dev_addr));
599 printk( "%02x%s", dev->dev_addr[i], (i < 5) ? ":" : "\n" );
600 if (lp->cardtype == OLD_RIEBL) { 600 if (lp->cardtype == OLD_RIEBL) {
601 printk( "%s: Warning: This is a default ethernet address!\n", 601 printk( "%s: Warning: This is a default ethernet address!\n",
602 dev->name ); 602 dev->name );
@@ -779,6 +779,8 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
779 int entry, len; 779 int entry, len;
780 struct lance_tx_head *head; 780 struct lance_tx_head *head;
781 unsigned long flags; 781 unsigned long flags;
782 DECLARE_MAC_BUF(mac);
783 DECLARE_MAC_BUF(mac2);
782 784
783 DPRINTK( 2, ( "%s: lance_start_xmit() called, csr0 %4.4x.\n", 785 DPRINTK( 2, ( "%s: lance_start_xmit() called, csr0 %4.4x.\n",
784 dev->name, DREG )); 786 dev->name, DREG ));
@@ -801,17 +803,13 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
801 803
802 /* Fill in a Tx ring entry */ 804 /* Fill in a Tx ring entry */
803 if (lance_debug >= 3) { 805 if (lance_debug >= 3) {
804 u_char *p; 806 printk( "%s: TX pkt type 0x%04x from "
805 int i; 807 "%s to %s"
806 printk( "%s: TX pkt type 0x%04x from ", dev->name, 808 " data at 0x%08x len %d\n",
807 ((u_short *)skb->data)[6]); 809 dev->name, ((u_short *)skb->data)[6],
808 for( p = &((u_char *)skb->data)[6], i = 0; i < 6; i++ ) 810 print_mac(mac, &skb->data[6]),
809 printk("%02x%s", *p++, i != 5 ? ":" : "" ); 811 print_mac(mac2, skb->data),
810 printk(" to "); 812 (int)skb->data, (int)skb->len );
811 for( p = (u_char *)skb->data, i = 0; i < 6; i++ )
812 printk("%02x%s", *p++, i != 5 ? ":" : "" );
813 printk(" data at 0x%08x len %d\n", (int)skb->data,
814 (int)skb->len );
815 } 813 }
816 814
817 /* We're not prepared for the int until the last flags are set/reset. And 815 /* 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 )
1021 } 1019 }
1022 1020
1023 if (lance_debug >= 3) { 1021 if (lance_debug >= 3) {
1024 u_char *data = PKTBUF_ADDR(head), *p; 1022 u_char *data = PKTBUF_ADDR(head);
1025 printk( "%s: RX pkt type 0x%04x from ", dev->name, 1023 DECLARE_MAC_BUF(mac);
1026 ((u_short *)data)[6]); 1024 DECLARE_MAC_BUF(mac2);
1027 for( p = &data[6], i = 0; i < 6; i++ ) 1025
1028 printk("%02x%s", *p++, i != 5 ? ":" : "" ); 1026 printk(KERN_DEBUG "%s: RX pkt type 0x%04x from %s to %s ",
1029 printk(" to "); 1027 "data %02x %02x %02x %02x %02x %02x %02x %02x "
1030 for( p = data, i = 0; i < 6; i++ )
1031 printk("%02x%s", *p++, i != 5 ? ":" : "" );
1032 printk(" data %02x %02x %02x %02x %02x %02x %02x %02x "
1033 "len %d\n", 1028 "len %d\n",
1029 dev->name, ((u_short *)data)[6],
1030 print_mac(mac, &data[6]), print_mac(mac2, data),
1034 data[15], data[16], data[17], data[18], 1031 data[15], data[16], data[17], data[18],
1035 data[19], data[20], data[21], data[22], 1032 data[19], data[20], data[21], data[22],
1036 pkt_len ); 1033 pkt_len);
1037 } 1034 }
1038 1035
1039 skb_reserve( skb, 2 ); /* 16 byte align */ 1036 skb_reserve( skb, 2 ); /* 16 byte align */