| Message ID | 1557177887-30446-3-git-send-email-ynezz@true.cz |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | of_get_mac_address ERR_PTR fixes | expand |
On Tue, 7 May 2019 at 00:26, Petr Štetiar <ynezz@true.cz> wrote: > > 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> > --- > net/dsa/slave.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/dsa/slave.c b/net/dsa/slave.c > index 316bce9..fe7b6a6 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); > -- > 1.9.1 > Tested-by: Vladimir Oltean <olteanv@gmail.com>
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 316bce9..fe7b6a6 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);
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> --- net/dsa/slave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)