Commit d2a6e48e authored by Antoine Tenart's avatar Antoine Tenart Committed by David S. Miller

net: mvpp2: fix use of the random mac address for PPv2.2

The MAC retrieval logic is using a variable to store an h/w stored mac
address and checks this mac against invalid ones before using it. But
the mac address is only read from h/w when using PPv2.1. So when using
PPv2.2 it defaults to its init state.

This patches fixes the logic to only check if the h/w mac is valid when
actually retrieving a mac from h/w.
Signed-off-by: default avatarAntoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ba8c81e
...@@ -7478,15 +7478,17 @@ static void mvpp2_port_copy_mac_addr(struct net_device *dev, struct mvpp2 *priv, ...@@ -7478,15 +7478,17 @@ static void mvpp2_port_copy_mac_addr(struct net_device *dev, struct mvpp2 *priv,
*mac_from = "device tree"; *mac_from = "device tree";
ether_addr_copy(dev->dev_addr, dt_mac_addr); ether_addr_copy(dev->dev_addr, dt_mac_addr);
} else { } else {
if (priv->hw_version == MVPP21) if (priv->hw_version == MVPP21) {
mvpp21_get_mac_address(port, hw_mac_addr); mvpp21_get_mac_address(port, hw_mac_addr);
if (is_valid_ether_addr(hw_mac_addr)) { if (is_valid_ether_addr(hw_mac_addr)) {
*mac_from = "hardware"; *mac_from = "hardware";
ether_addr_copy(dev->dev_addr, hw_mac_addr); ether_addr_copy(dev->dev_addr, hw_mac_addr);
} else { return;
*mac_from = "random"; }
eth_hw_addr_random(dev);
} }
*mac_from = "random";
eth_hw_addr_random(dev);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment