diff options
Diffstat (limited to 'drivers/net/de620.c')
-rw-r--r-- | drivers/net/de620.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/de620.c b/drivers/net/de620.c index d454e143483e..0d4b6acc11a6 100644 --- a/drivers/net/de620.c +++ b/drivers/net/de620.c | |||
@@ -686,7 +686,6 @@ static int de620_rx_intr(struct net_device *dev) | |||
686 | PRINTK(("Read %d bytes\n", size)); | 686 | PRINTK(("Read %d bytes\n", size)); |
687 | skb->protocol=eth_type_trans(skb,dev); | 687 | skb->protocol=eth_type_trans(skb,dev); |
688 | netif_rx(skb); /* deliver it "upstairs" */ | 688 | netif_rx(skb); /* deliver it "upstairs" */ |
689 | dev->last_rx = jiffies; | ||
690 | /* count all receives */ | 689 | /* count all receives */ |
691 | dev->stats.rx_packets++; | 690 | dev->stats.rx_packets++; |
692 | dev->stats.rx_bytes += size; | 691 | dev->stats.rx_bytes += size; |
@@ -800,7 +799,6 @@ struct net_device * __init de620_probe(int unit) | |||
800 | struct net_device *dev; | 799 | struct net_device *dev; |
801 | int err = -ENOMEM; | 800 | int err = -ENOMEM; |
802 | int i; | 801 | int i; |
803 | DECLARE_MAC_BUF(mac); | ||
804 | 802 | ||
805 | dev = alloc_etherdev(0); | 803 | dev = alloc_etherdev(0); |
806 | if (!dev) | 804 | if (!dev) |
@@ -853,7 +851,7 @@ struct net_device * __init de620_probe(int unit) | |||
853 | dev->broadcast[i] = 0xff; | 851 | dev->broadcast[i] = 0xff; |
854 | } | 852 | } |
855 | 853 | ||
856 | printk(", Ethernet Address: %s", print_mac(mac, dev->dev_addr)); | 854 | printk(", Ethernet Address: %pM", dev->dev_addr); |
857 | 855 | ||
858 | printk(" (%dk RAM,", | 856 | printk(" (%dk RAM,", |
859 | (nic_data.RAM_Size) ? (nic_data.RAM_Size >> 2) : 64); | 857 | (nic_data.RAM_Size) ? (nic_data.RAM_Size >> 2) : 64); |
@@ -876,10 +874,7 @@ struct net_device * __init de620_probe(int unit) | |||
876 | if (de620_debug) { | 874 | if (de620_debug) { |
877 | printk("\nEEPROM contents:\n"); | 875 | printk("\nEEPROM contents:\n"); |
878 | printk("RAM_Size = 0x%02X\n", nic_data.RAM_Size); | 876 | printk("RAM_Size = 0x%02X\n", nic_data.RAM_Size); |
879 | printk("NodeID = %02X:%02X:%02X:%02X:%02X:%02X\n", | 877 | printk("NodeID = %pM\n", nic_data.NodeID); |
880 | nic_data.NodeID[0], nic_data.NodeID[1], | ||
881 | nic_data.NodeID[2], nic_data.NodeID[3], | ||
882 | nic_data.NodeID[4], nic_data.NodeID[5]); | ||
883 | printk("Model = %d\n", nic_data.Model); | 878 | printk("Model = %d\n", nic_data.Model); |
884 | printk("Media = %d\n", nic_data.Media); | 879 | printk("Media = %d\n", nic_data.Media); |
885 | printk("SCR = 0x%02x\n", nic_data.SCR); | 880 | printk("SCR = 0x%02x\n", nic_data.SCR); |