| Message ID | 20240910220913.14101-1-rosenp@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b2d9544070d052804a12a7859aa212e952b96691 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [PATCHv2,net-next] net: gianfar: fix NVMEM mac address | expand |
On Tue, Sep 10, 2024 at 03:09:13PM -0700, Rosen Penev wrote: > If nvmem loads after the ethernet driver, mac address assignments will > not take effect. of_get_ethdev_address returns EPROBE_DEFER in such a > case so we need to handle that to avoid eth_hw_addr_random. > > Signed-off-by: Rosen Penev <rosenp@gmail.com> > v2: use goto instead of return Thanks for the update. Reviewed-by: Simon Horman <horms@kernel.org> ...
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Tue, 10 Sep 2024 15:09:13 -0700 you wrote: > If nvmem loads after the ethernet driver, mac address assignments will > not take effect. of_get_ethdev_address returns EPROBE_DEFER in such a > case so we need to handle that to avoid eth_hw_addr_random. > > Signed-off-by: Rosen Penev <rosenp@gmail.com> > v2: use goto instead of return > > [...] Here is the summary with links: - [PATCHv2,net-next] net: gianfar: fix NVMEM mac address https://git.kernel.org/netdev/net-next/c/b2d9544070d0 You are awesome, thank you!
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index 2baef59f741d..ecb1703ea150 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -754,6 +754,8 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev) priv->device_flags |= FSL_GIANFAR_DEV_HAS_BUF_STASHING; err = of_get_ethdev_address(np, dev); + if (err == -EPROBE_DEFER) + goto err_grp_init; if (err) { eth_hw_addr_random(dev); dev_info(&ofdev->dev, "Using random MAC address: %pM\n", dev->dev_addr);
If nvmem loads after the ethernet driver, mac address assignments will not take effect. of_get_ethdev_address returns EPROBE_DEFER in such a case so we need to handle that to avoid eth_hw_addr_random. Signed-off-by: Rosen Penev <rosenp@gmail.com> v2: use goto instead of return --- drivers/net/ethernet/freescale/gianfar.c | 2 ++ 1 file changed, 2 insertions(+)