aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/niu.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/niu.c')
-rw-r--r--drivers/net/niu.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 1b6f548c4411..5ddca4e3d27b 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -3392,8 +3392,6 @@ static int niu_process_rx_pkt(struct niu *np, struct rx_ring_info *rp)
3392 skb->protocol = eth_type_trans(skb, np->dev); 3392 skb->protocol = eth_type_trans(skb, np->dev);
3393 netif_receive_skb(skb); 3393 netif_receive_skb(skb);
3394 3394
3395 np->dev->last_rx = jiffies;
3396
3397 return num_rcr; 3395 return num_rcr;
3398} 3396}
3399 3397
@@ -8909,10 +8907,8 @@ static void __devinit niu_assign_netdev_ops(struct net_device *dev)
8909static void __devinit niu_device_announce(struct niu *np) 8907static void __devinit niu_device_announce(struct niu *np)
8910{ 8908{
8911 struct net_device *dev = np->dev; 8909 struct net_device *dev = np->dev;
8912 DECLARE_MAC_BUF(mac);
8913 8910
8914 pr_info("%s: NIU Ethernet %s\n", 8911 pr_info("%s: NIU Ethernet %pM\n", dev->name, dev->dev_addr);
8915 dev->name, print_mac(mac, dev->dev_addr));
8916 8912
8917 if (np->parent->plat_type == PLAT_TYPE_ATCA_CP3220) { 8913 if (np->parent->plat_type == PLAT_TYPE_ATCA_CP3220) {
8918 pr_info("%s: Port type[%s] mode[%s:%s] XCVR[%s] phy[%s]\n", 8914 pr_info("%s: Port type[%s] mode[%s:%s] XCVR[%s] phy[%s]\n",