Merge tag 'pwm/for-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[mirror_ubuntu-artful-kernel.git] / drivers / net / ethernet / netx-eth.c

diff --git a/drivers/net/ethernet/netx-eth.c b/drivers/net/ethernet/netx-eth.c
index 9fbc302642373adfcca03be6cff38d3d442c7b08..adbc47f2d132d4f7c70b10329253cc5b13c7ab94 100644 (file)
--- a/drivers/net/ethernet/netx-eth.c
+++ b/drivers/net/ethernet/netx-eth.c
@@ -313,7 +313,8 @@ static int netx_eth_enable(struct net_device *ndev)
 {
        struct netx_eth_priv *priv = netdev_priv(ndev);
        unsigned int mac4321, mac65;
-       int running, i;
+       int running, i, ret;
+       bool inv_mac_addr = false;
 
        ndev->netdev_ops = &netx_eth_netdev_ops;
        ndev->watchdog_timeo = msecs_to_jiffies(5000);
@@ -358,15 +359,18 @@ static int netx_eth_enable(struct net_device *ndev)
        xc_start(priv->xc);
 
        if (!is_valid_ether_addr(ndev->dev_addr))
-               printk("%s: Invalid ethernet MAC address.  Please "
-                      "set using ifconfig\n", ndev->name);
+               inv_mac_addr = true;
 
        for (i=2; i<=18; i++)
                pfifo_push(EMPTY_PTR_FIFO(priv->id),
                        FIFO_PTR_FRAMENO(i) | FIFO_PTR_SEGMENT(priv->id));
 
-       return register_netdev(ndev);
+       ret = register_netdev(ndev);
+       if (inv_mac_addr)
+               printk("%s: Invalid ethernet MAC address. Please set using ip\n",
+                      ndev->name);
 
+       return ret;
 }
 
 static int netx_eth_drv_probe(struct platform_device *pdev)