diff options
Diffstat (limited to 'drivers/net/tulip/de2104x.c')
-rw-r--r-- | drivers/net/tulip/de2104x.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c index 124d5d690dde..e23a5084c6ca 100644 --- a/drivers/net/tulip/de2104x.c +++ b/drivers/net/tulip/de2104x.c | |||
@@ -459,7 +459,6 @@ static void de_rx (struct de_private *de) | |||
459 | 459 | ||
460 | de->net_stats.rx_packets++; | 460 | de->net_stats.rx_packets++; |
461 | de->net_stats.rx_bytes += skb->len; | 461 | de->net_stats.rx_bytes += skb->len; |
462 | de->dev->last_rx = jiffies; | ||
463 | rc = netif_rx (skb); | 462 | rc = netif_rx (skb); |
464 | if (rc == NET_RX_DROP) | 463 | if (rc == NET_RX_DROP) |
465 | drop = 1; | 464 | drop = 1; |
@@ -1932,7 +1931,6 @@ static int __devinit de_init_one (struct pci_dev *pdev, | |||
1932 | void __iomem *regs; | 1931 | void __iomem *regs; |
1933 | unsigned long pciaddr; | 1932 | unsigned long pciaddr; |
1934 | static int board_idx = -1; | 1933 | static int board_idx = -1; |
1935 | DECLARE_MAC_BUF(mac); | ||
1936 | 1934 | ||
1937 | board_idx++; | 1935 | board_idx++; |
1938 | 1936 | ||
@@ -2046,11 +2044,11 @@ static int __devinit de_init_one (struct pci_dev *pdev, | |||
2046 | goto err_out_iomap; | 2044 | goto err_out_iomap; |
2047 | 2045 | ||
2048 | /* print info about board and interface just registered */ | 2046 | /* print info about board and interface just registered */ |
2049 | printk (KERN_INFO "%s: %s at 0x%lx, %s, IRQ %d\n", | 2047 | printk (KERN_INFO "%s: %s at 0x%lx, %pM, IRQ %d\n", |
2050 | dev->name, | 2048 | dev->name, |
2051 | de->de21040 ? "21040" : "21041", | 2049 | de->de21040 ? "21040" : "21041", |
2052 | dev->base_addr, | 2050 | dev->base_addr, |
2053 | print_mac(mac, dev->dev_addr), | 2051 | dev->dev_addr, |
2054 | dev->irq); | 2052 | dev->irq); |
2055 | 2053 | ||
2056 | pci_set_drvdata(pdev, dev); | 2054 | pci_set_drvdata(pdev, dev); |