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

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: default avatarAntoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d2a6e48e
...@@ -7477,19 +7477,20 @@ static void mvpp2_port_copy_mac_addr(struct net_device *dev, struct mvpp2 *priv, ...@@ -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)) { if (dt_mac_addr && is_valid_ether_addr(dt_mac_addr)) {
*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 { return;
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"; if (priv->hw_version == MVPP21) {
eth_hw_addr_random(dev); 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 */ /* Ports initialization */
......
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