Commit 0c9e0c79 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller

ethernet: bcmgenet: use eth_hw_addr_set()

Commit 406f42fa ("net-next: When a bond have a massive amount
of VLANs...") introduced a rbtree for faster Ethernet address look
up. To maintain netdev->dev_addr in this tree we need to make all
the writes to it got through appropriate helpers.

Read the address into an array on the stack, then call
eth_hw_addr_set().
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a85c8f9a
...@@ -4085,8 +4085,12 @@ static int bcmgenet_probe(struct platform_device *pdev) ...@@ -4085,8 +4085,12 @@ static int bcmgenet_probe(struct platform_device *pdev)
eth_hw_addr_set(dev, pd->mac_address); eth_hw_addr_set(dev, pd->mac_address);
else else
if (device_get_ethdev_address(&pdev->dev, dev)) if (device_get_ethdev_address(&pdev->dev, dev))
if (has_acpi_companion(&pdev->dev)) if (has_acpi_companion(&pdev->dev)) {
bcmgenet_get_hw_addr(priv, dev->dev_addr); u8 addr[ETH_ALEN];
bcmgenet_get_hw_addr(priv, addr);
eth_hw_addr_set(dev, addr);
}
if (!is_valid_ether_addr(dev->dev_addr)) { if (!is_valid_ether_addr(dev->dev_addr)) {
dev_warn(&pdev->dev, "using random Ethernet MAC\n"); dev_warn(&pdev->dev, "using random Ethernet MAC\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment