diff options
author | 2019-05-06 23:24:45 +0200 | |
---|---|---|
committer | 2019-05-07 12:22:47 -0700 | |
commit | 4974f9b7e0c90a751e9ec306701c49487e81625a (patch) | |
tree | f464689350d2aaa95f9c9cdba9ee4904c43570f1 /net/dsa | |
parent | net: dsa: sja1105: Fix status initialization in sja1105_get_ethtool_stats (diff) | |
download | linux-4974f9b7e0c90a751e9ec306701c49487e81625a.tar.gz linux-4974f9b7e0c90a751e9ec306701c49487e81625a.tar.bz2 linux-4974f9b7e0c90a751e9ec306701c49487e81625a.zip |
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: d01f449c008a ("of_net: add NVMEM support to of_get_mac_address")
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Tested-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
-rw-r--r-- | net/dsa/slave.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 316bce9e0fbf..fe7b6a62e8f1 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1418,7 +1418,7 @@ int dsa_slave_create(struct dsa_port *port) NETIF_F_HW_VLAN_CTAG_FILTER; slave_dev->hw_features |= NETIF_F_HW_TC; 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); else eth_hw_addr_inherit(slave_dev, master); |