diff options
Diffstat (limited to 'drivers/net/sundance.c')
-rw-r--r-- | drivers/net/sundance.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c index f860ea150395..698893b92003 100644 --- a/drivers/net/sundance.c +++ b/drivers/net/sundance.c | |||
@@ -468,7 +468,6 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev, | |||
468 | int bar = 1; | 468 | int bar = 1; |
469 | #endif | 469 | #endif |
470 | int phy, phy_end, phy_idx = 0; | 470 | int phy, phy_end, phy_idx = 0; |
471 | DECLARE_MAC_BUF(mac); | ||
472 | 471 | ||
473 | /* when built into the kernel, we only print version if device is found */ | 472 | /* when built into the kernel, we only print version if device is found */ |
474 | #ifndef MODULE | 473 | #ifndef MODULE |
@@ -547,9 +546,9 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev, | |||
547 | if (i) | 546 | if (i) |
548 | goto err_out_unmap_rx; | 547 | goto err_out_unmap_rx; |
549 | 548 | ||
550 | printk(KERN_INFO "%s: %s at %p, %s, IRQ %d.\n", | 549 | printk(KERN_INFO "%s: %s at %p, %pM, IRQ %d.\n", |
551 | dev->name, pci_id_tbl[chip_idx].name, ioaddr, | 550 | dev->name, pci_id_tbl[chip_idx].name, ioaddr, |
552 | print_mac(mac, dev->dev_addr), irq); | 551 | dev->dev_addr, irq); |
553 | 552 | ||
554 | np->phys[0] = 1; /* Default setting */ | 553 | np->phys[0] = 1; /* Default setting */ |
555 | np->mii_preamble_required++; | 554 | np->mii_preamble_required++; |
@@ -1351,7 +1350,6 @@ static void rx_poll(unsigned long data) | |||
1351 | skb->protocol = eth_type_trans(skb, dev); | 1350 | skb->protocol = eth_type_trans(skb, dev); |
1352 | /* Note: checksum -> skb->ip_summed = CHECKSUM_UNNECESSARY; */ | 1351 | /* Note: checksum -> skb->ip_summed = CHECKSUM_UNNECESSARY; */ |
1353 | netif_rx(skb); | 1352 | netif_rx(skb); |
1354 | dev->last_rx = jiffies; | ||
1355 | } | 1353 | } |
1356 | entry = (entry + 1) % RX_RING_SIZE; | 1354 | entry = (entry + 1) % RX_RING_SIZE; |
1357 | received++; | 1355 | received++; |