diff options
Diffstat (limited to 'drivers/net/natsemi.c')
-rw-r--r-- | drivers/net/natsemi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index f7fa3944659b..9f81fcb96882 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -792,7 +792,6 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev, | |||
792 | const int pcibar = 1; /* PCI base address register */ | 792 | const int pcibar = 1; /* PCI base address register */ |
793 | int prev_eedata; | 793 | int prev_eedata; |
794 | u32 tmp; | 794 | u32 tmp; |
795 | DECLARE_MAC_BUF(mac); | ||
796 | 795 | ||
797 | /* when built into the kernel, we only print version if device is found */ | 796 | /* when built into the kernel, we only print version if device is found */ |
798 | #ifndef MODULE | 797 | #ifndef MODULE |
@@ -948,10 +947,10 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev, | |||
948 | 947 | ||
949 | if (netif_msg_drv(np)) { | 948 | if (netif_msg_drv(np)) { |
950 | printk(KERN_INFO "natsemi %s: %s at %#08llx " | 949 | printk(KERN_INFO "natsemi %s: %s at %#08llx " |
951 | "(%s), %s, IRQ %d", | 950 | "(%s), %pM, IRQ %d", |
952 | dev->name, natsemi_pci_info[chip_idx].name, | 951 | dev->name, natsemi_pci_info[chip_idx].name, |
953 | (unsigned long long)iostart, pci_name(np->pci_dev), | 952 | (unsigned long long)iostart, pci_name(np->pci_dev), |
954 | print_mac(mac, dev->dev_addr), irq); | 953 | dev->dev_addr, irq); |
955 | if (dev->if_port == PORT_TP) | 954 | if (dev->if_port == PORT_TP) |
956 | printk(", port TP.\n"); | 955 | printk(", port TP.\n"); |
957 | else if (np->ignore_phy) | 956 | else if (np->ignore_phy) |
@@ -2362,7 +2361,6 @@ static void netdev_rx(struct net_device *dev, int *work_done, int work_to_do) | |||
2362 | } | 2361 | } |
2363 | skb->protocol = eth_type_trans(skb, dev); | 2362 | skb->protocol = eth_type_trans(skb, dev); |
2364 | netif_receive_skb(skb); | 2363 | netif_receive_skb(skb); |
2365 | dev->last_rx = jiffies; | ||
2366 | np->stats.rx_packets++; | 2364 | np->stats.rx_packets++; |
2367 | np->stats.rx_bytes += pkt_len; | 2365 | np->stats.rx_bytes += pkt_len; |
2368 | } | 2366 | } |