]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ethernet: bcmgenet: use eth_hw_addr_set()
authorJakub Kicinski <kuba@kernel.org>
Fri, 15 Oct 2021 22:16:47 +0000 (15:16 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 16 Oct 2021 07:53:46 +0000 (08:53 +0100)
Commit 406f42fa0d3c ("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: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/genet/bcmgenet.c

index ed53859b6f7d0bfc91020c66123ecf8309676c9a..5da9c00b43b1533312af25dd4664b372233df289 100644 (file)
@@ -4085,8 +4085,12 @@ static int bcmgenet_probe(struct platform_device *pdev)
                eth_hw_addr_set(dev, pd->mac_address);
        else
                if (device_get_ethdev_address(&pdev->dev, dev))
-                       if (has_acpi_companion(&pdev->dev))
-                               bcmgenet_get_hw_addr(priv, dev->dev_addr);
+                       if (has_acpi_companion(&pdev->dev)) {
+                               u8 addr[ETH_ALEN];
+
+                               bcmgenet_get_hw_addr(priv, addr);
+                               eth_hw_addr_set(dev, addr);
+                       }
 
        if (!is_valid_ether_addr(dev->dev_addr)) {
                dev_warn(&pdev->dev, "using random Ethernet MAC\n");