Commit 4974f9b7 authored by Petr Štetiar's avatar Petr Štetiar Committed by David S. Miller

net: dsa: support of_get_mac_address new ERR_PTR error

There was NVMEM support added to of_get_mac_address, so it could now
return ERR_PTR encoded error values, so we need to adjust all current
users of of_get_mac_address to this new fact.

While at it, remove superfluous is_valid_ether_addr as the MAC address
returned from of_get_mac_address is always valid and checked by
is_valid_ether_addr anyway.

Fixes: d01f449c ("of_net: add NVMEM support to of_get_mac_address")
Signed-off-by: default avatarPetr Štetiar <ynezz@true.cz>
Tested-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8e8673a2
...@@ -1418,7 +1418,7 @@ int dsa_slave_create(struct dsa_port *port) ...@@ -1418,7 +1418,7 @@ int dsa_slave_create(struct dsa_port *port)
NETIF_F_HW_VLAN_CTAG_FILTER; NETIF_F_HW_VLAN_CTAG_FILTER;
slave_dev->hw_features |= NETIF_F_HW_TC; slave_dev->hw_features |= NETIF_F_HW_TC;
slave_dev->ethtool_ops = &dsa_slave_ethtool_ops; slave_dev->ethtool_ops = &dsa_slave_ethtool_ops;
if (port->mac && is_valid_ether_addr(port->mac)) if (!IS_ERR_OR_NULL(port->mac))
ether_addr_copy(slave_dev->dev_addr, port->mac); ether_addr_copy(slave_dev->dev_addr, port->mac);
else else
eth_hw_addr_inherit(slave_dev, master); eth_hw_addr_inherit(slave_dev, master);
......
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