| Message ID | 20211214095534.563822-1-clement.leger@bootlin.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 843869951258f38dc3d9702a19df7c4c79911aee |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: ocelot: add support to get port mac from device-tree | expand |
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Tue, 14 Dec 2021 10:55:34 +0100 you wrote: > Add support to get mac from device-tree using of_get_ethdev_address. > > Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> > Signed-off-by: Clément Léger <clement.leger@bootlin.com> > --- > drivers/net/ethernet/mscc/ocelot_net.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Here is the summary with links: - [net-next] net: ocelot: add support to get port mac from device-tree https://git.kernel.org/netdev/net-next/c/843869951258 You are awesome, thank you!
diff --git a/drivers/net/ethernet/mscc/ocelot_net.c b/drivers/net/ethernet/mscc/ocelot_net.c index 5fc8a0f8e8cd..8115c3db252e 100644 --- a/drivers/net/ethernet/mscc/ocelot_net.c +++ b/drivers/net/ethernet/mscc/ocelot_net.c @@ -1695,7 +1695,10 @@ int ocelot_probe_port(struct ocelot *ocelot, int port, struct regmap *target, NETIF_F_HW_TC; dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_HW_TC; - eth_hw_addr_gen(dev, ocelot->base_mac, port); + err = of_get_ethdev_address(portnp, dev); + if (err) + eth_hw_addr_gen(dev, ocelot->base_mac, port); + ocelot_mact_learn(ocelot, PGID_CPU, dev->dev_addr, OCELOT_VLAN_UNAWARE_PVID, ENTRYTYPE_LOCKED);