aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/via-rhine.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/via-rhine.c')
-rw-r--r--drivers/net/via-rhine.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index 5b7870080c56..9a650d0a6795 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -631,7 +631,6 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
631#else 631#else
632 int bar = 0; 632 int bar = 0;
633#endif 633#endif
634 DECLARE_MAC_BUF(mac);
635 634
636/* when built into the kernel, we only print version if device is found */ 635/* when built into the kernel, we only print version if device is found */
637#ifndef MODULE 636#ifndef MODULE
@@ -787,14 +786,14 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
787 if (rc) 786 if (rc)
788 goto err_out_unmap; 787 goto err_out_unmap;
789 788
790 printk(KERN_INFO "%s: VIA %s at 0x%lx, %s, IRQ %d.\n", 789 printk(KERN_INFO "%s: VIA %s at 0x%lx, %pM, IRQ %d.\n",
791 dev->name, name, 790 dev->name, name,
792#ifdef USE_MMIO 791#ifdef USE_MMIO
793 memaddr, 792 memaddr,
794#else 793#else
795 (long)ioaddr, 794 (long)ioaddr,
796#endif 795#endif
797 print_mac(mac, dev->dev_addr), pdev->irq); 796 dev->dev_addr, pdev->irq);
798 797
799 pci_set_drvdata(pdev, dev); 798 pci_set_drvdata(pdev, dev);
800 799
@@ -1505,7 +1504,6 @@ static int rhine_rx(struct net_device *dev, int limit)
1505 } 1504 }
1506 skb->protocol = eth_type_trans(skb, dev); 1505 skb->protocol = eth_type_trans(skb, dev);
1507 netif_receive_skb(skb); 1506 netif_receive_skb(skb);
1508 dev->last_rx = jiffies;
1509 rp->stats.rx_bytes += pkt_len; 1507 rp->stats.rx_bytes += pkt_len;
1510 rp->stats.rx_packets++; 1508 rp->stats.rx_packets++;
1511 } 1509 }