net: bcmgenet: Generate a random MAC if none is valid

Instead of having a hard failure and stopping the driver's probe
routine, generate a random Ethernet MAC address to keep going.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Doug Berger <opendmb@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 12cb77ef1081b6df50c0328eee989827bce8e5a2..dd4e4f1dd3842aef997cfd8b87d3bc58abc1cbfb 100644 (file)
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -3461,16 +3461,10 @@ static int bcmgenet_probe(struct platform_device *pdev)
                goto err;
        }
 
-       if (dn) {
+       if (dn)
                macaddr = of_get_mac_address(dn);
-               if (IS_ERR(macaddr)) {
-                       dev_err(&pdev->dev, "can't find MAC address\n");
-                       err = -EINVAL;
-                       goto err;
-               }
-       } else {
+       else
                macaddr = pd->mac_address;
-       }
 
        priv->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(priv->base)) {
@@ -3482,7 +3476,12 @@ static int bcmgenet_probe(struct platform_device *pdev)
 
        SET_NETDEV_DEV(dev, &pdev->dev);
        dev_set_drvdata(&pdev->dev, dev);
-       ether_addr_copy(dev->dev_addr, macaddr);
+       if (IS_ERR_OR_NULL(macaddr) || !is_valid_ether_addr(macaddr)) {
+               dev_warn(&pdev->dev, "using random Ethernet MAC\n");
+               eth_hw_addr_random(dev);
+       } else {
+               ether_addr_copy(dev->dev_addr, macaddr);
+       }
        dev->watchdog_timeo = 2 * HZ;
        dev->ethtool_ops = &bcmgenet_ethtool_ops;
        dev->netdev_ops = &bcmgenet_netdev_ops;