aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/mv643xx_eth.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
-rw-r--r--drivers/net/mv643xx_eth.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index b9dcdbd369f8..b13fbc4ebd87 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -557,8 +557,6 @@ static int rxq_process(struct rx_queue *rxq, int budget)
557 skb->protocol = eth_type_trans(skb, mp->dev); 557 skb->protocol = eth_type_trans(skb, mp->dev);
558 netif_receive_skb(skb); 558 netif_receive_skb(skb);
559 } 559 }
560
561 mp->dev->last_rx = jiffies;
562 } 560 }
563 561
564 if (rx < budget) 562 if (rx < budget)
@@ -2592,7 +2590,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
2592 struct mv643xx_eth_private *mp; 2590 struct mv643xx_eth_private *mp;
2593 struct net_device *dev; 2591 struct net_device *dev;
2594 struct resource *res; 2592 struct resource *res;
2595 DECLARE_MAC_BUF(mac);
2596 int err; 2593 int err;
2597 2594
2598 pd = pdev->dev.platform_data; 2595 pd = pdev->dev.platform_data;
@@ -2686,8 +2683,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
2686 if (err) 2683 if (err)
2687 goto out; 2684 goto out;
2688 2685
2689 dev_printk(KERN_NOTICE, &dev->dev, "port %d with MAC address %s\n", 2686 dev_printk(KERN_NOTICE, &dev->dev, "port %d with MAC address %pM\n",
2690 mp->port_num, print_mac(mac, dev->dev_addr)); 2687 mp->port_num, dev->dev_addr);
2691 2688
2692 if (mp->tx_desc_sram_size > 0) 2689 if (mp->tx_desc_sram_size > 0)
2693 dev_printk(KERN_NOTICE, &dev->dev, "configured with sram\n"); 2690 dev_printk(KERN_NOTICE, &dev->dev, "configured with sram\n");