r8152: Use MAC address from device tree if available (acb6d377) · Commits · 戴 / test

If a MAC address was passed via the device tree node for the r8152 device, use it and fall back to reading from EEPROM otherwise. This is useful for devices where the r8152 EEPROM was not programmed with a valid MAC address, or if users want to explicitly set a MAC address in the bootloader and pass that to the kernel. Signed-off-by:

Thierry Reding <treding@nvidia.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/usb/r8152.c

+13 −9

Original line number	Diff line number	Diff line
		@@ -1504,6 +1504,8 @@ 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);
		if (ret < 0) {
		if (tp->version == RTL_VER_01) {
		ret = pla_ocp_read(tp, PLA_IDR, 8, sa->sa_data);
		} else {
		@@ -1512,7 +1514,9 @@ static int determine_ethernet_addr(struct r8152 tp, struct sockaddr sa)
		*/
		ret = vendor_mac_passthru_addr_read(tp, sa);
		if (ret < 0)
		ret = pla_ocp_read(tp, PLA_BACKUP, 8, sa->sa_data);
		ret = pla_ocp_read(tp, PLA_BACKUP, 8,
		sa->sa_data);
		}
		}

		if (ret < 0) {

Admin message