diff options
Diffstat (limited to 'drivers/net/sgiseeq.c')
-rw-r--r-- | drivers/net/sgiseeq.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c index 6261201403cd..97d68560067d 100644 --- a/drivers/net/sgiseeq.c +++ b/drivers/net/sgiseeq.c | |||
@@ -377,7 +377,6 @@ memory_squeeze: | |||
377 | skb_put(skb, len); | 377 | skb_put(skb, len); |
378 | skb->protocol = eth_type_trans(skb, dev); | 378 | skb->protocol = eth_type_trans(skb, dev); |
379 | netif_rx(skb); | 379 | netif_rx(skb); |
380 | dev->last_rx = jiffies; | ||
381 | dev->stats.rx_packets++; | 380 | dev->stats.rx_packets++; |
382 | dev->stats.rx_bytes += len; | 381 | dev->stats.rx_bytes += len; |
383 | } else { | 382 | } else { |
@@ -657,7 +656,7 @@ static void timeout(struct net_device *dev) | |||
657 | 656 | ||
658 | static void sgiseeq_set_multicast(struct net_device *dev) | 657 | static void sgiseeq_set_multicast(struct net_device *dev) |
659 | { | 658 | { |
660 | struct sgiseeq_private *sp = (struct sgiseeq_private *) dev->priv; | 659 | struct sgiseeq_private *sp = netdev_priv(dev); |
661 | unsigned char oldmode = sp->mode; | 660 | unsigned char oldmode = sp->mode; |
662 | 661 | ||
663 | if(dev->flags & IFF_PROMISC) | 662 | if(dev->flags & IFF_PROMISC) |
@@ -719,7 +718,6 @@ static int __init sgiseeq_probe(struct platform_device *pdev) | |||
719 | struct sgiseeq_private *sp; | 718 | struct sgiseeq_private *sp; |
720 | struct net_device *dev; | 719 | struct net_device *dev; |
721 | int err; | 720 | int err; |
722 | DECLARE_MAC_BUF(mac); | ||
723 | 721 | ||
724 | dev = alloc_etherdev(sizeof (struct sgiseeq_private)); | 722 | dev = alloc_etherdev(sizeof (struct sgiseeq_private)); |
725 | if (!dev) { | 723 | if (!dev) { |
@@ -793,8 +791,7 @@ static int __init sgiseeq_probe(struct platform_device *pdev) | |||
793 | goto err_out_free_page; | 791 | goto err_out_free_page; |
794 | } | 792 | } |
795 | 793 | ||
796 | printk(KERN_INFO "%s: %s %s\n", | 794 | printk(KERN_INFO "%s: %s %pM\n", dev->name, sgiseeqstr, dev->dev_addr); |
797 | dev->name, sgiseeqstr, print_mac(mac, dev->dev_addr)); | ||
798 | 795 | ||
799 | return 0; | 796 | return 0; |
800 | 797 | ||