aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/enc28j60.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/enc28j60.c')
-rw-r--r--drivers/net/enc28j60.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index e1b441effbbe..d186a52cdb62 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -477,12 +477,10 @@ static int enc28j60_set_hw_macaddr(struct net_device *ndev)
477 477
478 mutex_lock(&priv->lock); 478 mutex_lock(&priv->lock);
479 if (!priv->hw_enable) { 479 if (!priv->hw_enable) {
480 if (netif_msg_drv(priv)) { 480 if (netif_msg_drv(priv))
481 DECLARE_MAC_BUF(mac);
482 printk(KERN_INFO DRV_NAME 481 printk(KERN_INFO DRV_NAME
483 ": %s: Setting MAC address to %s\n", 482 ": %s: Setting MAC address to %pM\n",
484 ndev->name, print_mac(mac, ndev->dev_addr)); 483 ndev->name, ndev->dev_addr);
485 }
486 /* NOTE: MAC address in ENC28J60 is byte-backward */ 484 /* NOTE: MAC address in ENC28J60 is byte-backward */
487 nolock_regb_write(priv, MAADR5, ndev->dev_addr[0]); 485 nolock_regb_write(priv, MAADR5, ndev->dev_addr[0]);
488 nolock_regb_write(priv, MAADR4, ndev->dev_addr[1]); 486 nolock_regb_write(priv, MAADR4, ndev->dev_addr[1]);
@@ -946,7 +944,6 @@ static void enc28j60_hw_rx(struct net_device *ndev)
946 /* update statistics */ 944 /* update statistics */
947 ndev->stats.rx_packets++; 945 ndev->stats.rx_packets++;
948 ndev->stats.rx_bytes += len; 946 ndev->stats.rx_bytes += len;
949 ndev->last_rx = jiffies;
950 netif_rx(skb); 947 netif_rx(skb);
951 } 948 }
952 } 949 }
@@ -1328,11 +1325,9 @@ static int enc28j60_net_open(struct net_device *dev)
1328 printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__); 1325 printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);
1329 1326
1330 if (!is_valid_ether_addr(dev->dev_addr)) { 1327 if (!is_valid_ether_addr(dev->dev_addr)) {
1331 if (netif_msg_ifup(priv)) { 1328 if (netif_msg_ifup(priv))
1332 DECLARE_MAC_BUF(mac); 1329 dev_err(&dev->dev, "invalid MAC address %pM\n",
1333 dev_err(&dev->dev, "invalid MAC address %s\n", 1330 dev->dev_addr);
1334 print_mac(mac, dev->dev_addr));
1335 }
1336 return -EADDRNOTAVAIL; 1331 return -EADDRNOTAVAIL;
1337 } 1332 }
1338 /* Reset the hardware here (and take it out of low power mode) */ 1333 /* Reset the hardware here (and take it out of low power mode) */