3 files changed, 20 insertions, 10 deletions

diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
index 9e061307975f..1471e16ba719 100644
--- a/drivers/net/ethernet/davicom/dm9000.c
+++ b/drivers/net/ethernet/davicom/dm9000.c
@@ -1432,6 +1432,7 @@ dm9000_probe(struct platform_device *pdev)
         int reset_gpios;
         enum of_gpio_flags flags;
         struct regulator *power;
+        bool inv_mac_addr = false;
 
         power = devm_regulator_get(dev, "vcc");
         if (IS_ERR(power)) {
@@ -1686,9 +1687,7 @@ dm9000_probe(struct platform_device *pdev)
         }
 
         if (!is_valid_ether_addr(ndev->dev_addr)) {
-                dev_warn(db->dev, "%s: Invalid ethernet MAC address. Please "
-                         "set using ifconfig\n", ndev->name);
-
+                inv_mac_addr = true;
                 eth_hw_addr_random(ndev);
                 mac_src = "random";
         }
@@ -1697,11 +1696,15 @@ dm9000_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, ndev);
         ret = register_netdev(ndev);
 
-        if (ret == 0)
+        if (ret == 0) {
+                if (inv_mac_addr)
+                        dev_warn(db->dev, "%s: Invalid ethernet MAC address. Please set using ip\n",
+                                 ndev->name);
                 printk(KERN_INFO "%s: dm9000%c at %p,%p IRQ %d MAC: %pM (%s)\n",
                        ndev->name, dm9000_type_to_char(db->type),
                        db->io_addr, db->io_data, ndev->irq,
                        ndev->dev_addr, mac_src);
+        }
         return 0;
 
 out:
diff --git a/drivers/net/ethernet/micrel/ks8695net.c b/drivers/net/ethernet/micrel/ks8695net.c
index a8522d8af95d..20cb85bc0c5f 100644
--- a/drivers/net/ethernet/micrel/ks8695net.c
+++ b/drivers/net/ethernet/micrel/ks8695net.c
@@ -1354,6 +1354,7 @@ ks8695_probe(struct platform_device *pdev)
         struct resource *rxirq_res, *txirq_res, *linkirq_res;
         int ret = 0;
         int buff_n;
+        bool inv_mac_addr = false;
         u32 machigh, maclow;
 
         /* Initialise a net_device */
@@ -1456,8 +1457,7 @@ ks8695_probe(struct platform_device *pdev)
         ndev->dev_addr[5] = maclow & 0xFF;
 
         if (!is_valid_ether_addr(ndev->dev_addr))
-                dev_warn(ksp->dev, "%s: Invalid ethernet MAC address. Please "
-                         "set using ifconfig\n", ndev->name);
+                inv_mac_addr = true;
 
         /* In order to be efficient memory-wise, we allocate both
          * rings in one go.
@@ -1520,6 +1520,9 @@ ks8695_probe(struct platform_device *pdev)
         ret = register_netdev(ndev);
 
         if (ret == 0) {
+                if (inv_mac_addr)
+                        dev_warn(ksp->dev, "%s: Invalid ethernet MAC address. Please set using ip\n",
+                                 ndev->name);
                 dev_info(ksp->dev, "ks8695 ethernet (%s) MAC: %pM\n",
                          ks8695_port_type(ksp), ndev->dev_addr);
         } else {
diff --git a/drivers/net/ethernet/netx-eth.c b/drivers/net/ethernet/netx-eth.c
index 9fbc30264237..adbc47f2d132 100644
--- 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)