net: mvpp2: fallback using h/w and random mac if the dt one isn't valid

When using a mac address described in the device tree, a check is made
to see if it is valid. When it's not, no fallback is defined. This
patches tries to get the mac address from h/w (or use a random one if
the h/w one isn't valid) when the dt mac address isn't valid.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c
index c6003508f1666328c196f60c2edf9d6a7a8bb0a7..dd0ee2691c863edab216c24e1e227bdb9dc84306 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
@@ -7477,19 +7477,20 @@ static void mvpp2_port_copy_mac_addr(struct net_device *dev, struct mvpp2 *priv,
        if (dt_mac_addr && is_valid_ether_addr(dt_mac_addr)) {
                *mac_from = "device tree";
                ether_addr_copy(dev->dev_addr, dt_mac_addr);
-       } else {
-               if (priv->hw_version == MVPP21) {
-                       mvpp21_get_mac_address(port, hw_mac_addr);
-                       if (is_valid_ether_addr(hw_mac_addr)) {
-                               *mac_from = "hardware";
-                               ether_addr_copy(dev->dev_addr, hw_mac_addr);
-                               return;
-                       }
-               }
+               return;
+       }
 
-               *mac_from = "random";
-               eth_hw_addr_random(dev);
+       if (priv->hw_version == MVPP21) {
+               mvpp21_get_mac_address(port, hw_mac_addr);
+               if (is_valid_ether_addr(hw_mac_addr)) {
+                       *mac_from = "hardware";
+                       ether_addr_copy(dev->dev_addr, hw_mac_addr);
+                       return;
+               }
        }
+
+       *mac_from = "random";
+       eth_hw_addr_random(dev);
 }
 
 /* Ports initialization */