Commit b9b40ee4 authored Aug 07, 2020 by Thierry Reding Committed by David S. Miller Aug 07, 2020

r8152: Use MAC address from correct device tree node



Query the USB device's device tree node when looking for a MAC address.
The struct device embedded into the struct net_device does not have a
device tree node attached at all.

The reason why this went unnoticed is because the system where this was
tested was one of the few development units that had its OTP programmed,
as opposed to production systems where the MAC address is stored in a
separate EEPROM and is passed via device tree by the firmware.

Reported-by: EJ Hsu <ejh@nvidia.com>
Fixes: acb6d377 ("r8152: Use MAC address from device tree if available")
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: EJ Hsu <ejh@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c7ca03c2

drivers/net/usb/r8152.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1504,7 +1504,7 @@ static int determine_ethernet_addr(struct r8152 tp, struct sockaddr sa)

		sa->sa_family = dev->type;

		ret = eth_platform_get_mac_address(&dev->dev, sa->sa_data);
		ret = eth_platform_get_mac_address(&tp->udev->dev, sa->sa_data);
		if (ret < 0) {
		if (tp->version == RTL_VER_01) {
		ret = pla_ocp_read(tp, PLA_IDR, 8, sa->sa_data);

Admin message