diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2025-09-15 18:34:11 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-09-15 18:34:12 -0700 |
| commit | 56f34e97d9eee6b640ff7a4baa7b8b773e152efe (patch) | |
| tree | 54ab95d99d125f9d9f088f5c50e71358e9962052 | |
| parent | a5a8844af43448cd2b3bf5f0e588396671192157 (diff) | |
| parent | d2d3f529e7b6ff2aa432b16a2317126621c28058 (diff) | |
| download | linux-56f34e97d9eee6b640ff7a4baa7b8b773e152efe.tar.gz linux-56f34e97d9eee6b640ff7a4baa7b8b773e152efe.zip | |
Merge branch 'microchip-lan865x-minor-improvements'
Stefan Wahren says:
====================
microchip: lan865x: Minor improvements
Recently I setup a custom i.MX93 board which contains a LAN8651 chip.
These minor improvements were considered as helpful.
The series has been tested with the mentioned i.MX93 board.
====================
Link: https://patch.msgid.link/20250912140332.35395-1-wahrenst@gmx.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | drivers/net/ethernet/microchip/lan865x/lan865x.c | 1 | ||||
| -rw-r--r-- | net/ethernet/eth.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/microchip/lan865x/lan865x.c b/drivers/net/ethernet/microchip/lan865x/lan865x.c index b428ad6516c5..0277d9737369 100644 --- a/drivers/net/ethernet/microchip/lan865x/lan865x.c +++ b/drivers/net/ethernet/microchip/lan865x/lan865x.c @@ -326,6 +326,7 @@ static const struct net_device_ops lan865x_netdev_ops = { .ndo_start_xmit = lan865x_send_packet, .ndo_set_rx_mode = lan865x_set_multicast_list, .ndo_set_mac_address = lan865x_set_mac_address, + .ndo_validate_addr = eth_validate_addr, .ndo_eth_ioctl = phy_do_ioctl_running, }; diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 4e3651101b86..43e211e611b1 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -613,7 +613,10 @@ EXPORT_SYMBOL(fwnode_get_mac_address); */ int device_get_mac_address(struct device *dev, char *addr) { - return fwnode_get_mac_address(dev_fwnode(dev), addr); + if (!fwnode_get_mac_address(dev_fwnode(dev), addr)) + return 0; + + return nvmem_get_mac_address(dev, addr); } EXPORT_SYMBOL(device_get_mac_address); |