Commit 0f50c10d authored Sep 28, 2015 by Liviu Dudau Committed by David S. Miller Sep 29, 2015

RESEND: [PATCH v3 net-next] sky2: use random address if EEPROM is bad



On some embedded systems the EEPROM does not contain a valid MAC address.
In that case it is better to fallback to a generated mac address and
let init scripts fix the value later.

Reported-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
[Changed handcoded setup to use eth_hw_addr_random() and to save new address into HW]
Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 822d54b9

drivers/net/ethernet/marvell/sky2.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -4819,6 +4819,18 @@ static struct net_device sky2_init_netdev(struct sky2_hw hw, unsigned port,
		memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8,
		ETH_ALEN);

		/* if the address is invalid, use a random value */
		if (!is_valid_ether_addr(dev->dev_addr)) {
		struct sockaddr sa = { AF_UNSPEC };

		netdev_warn(dev,
		"Invalid MAC address, defaulting to random\n");
		eth_hw_addr_random(dev);
		memcpy(sa.sa_data, dev->dev_addr, ETH_ALEN);
		if (sky2_set_mac_address(dev, &sa))
		netdev_warn(dev, "Failed to set MAC address.\n");
		}

		return dev;
		}