1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index 1d2ef8f47780..0358809f409c 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -653,7 +653,6 @@ 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
@@ -823,9 +822,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, %s, IRQ %d.\n",
+        printk(KERN_INFO "%s: %s at %p, %pM, IRQ %d.\n",
                dev->name, netdrv_tbl[chip_idx].name, base,
-               print_mac(mac, dev->dev_addr), irq);
+               dev->dev_addr, irq);
 
         if (drv_flags & CanHaveMII) {
                 int phy, phy_idx = 0;
@@ -1452,12 +1451,8 @@ 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 " MAC_FMT " " MAC_FMT
-                               " %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],
+                        printk(KERN_DEBUG "  Rx data %pM %pM %2.2x%2.2x.\n",
+                               skb->data, skb->data + 6,
                                skb->data[12], skb->data[13]);
                 }
 #endif
@@ -1501,7 +1496,6 @@ static int __netdev_rx(struct net_device *dev, int *quota)
                 } else
 #endif /* VLAN_SUPPORT */
                         netif_receive_skb(skb);
-                dev->last_rx = jiffies;
                 np->stats.rx_packets++;
 
         next_rx: