diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2021-10-15 15:16:47 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-10-16 08:53:46 +0100 |
| commit | 0c9e0c7931c610b9c2edce0a7a60b8de97e31885 (patch) | |
| tree | 37a0b4ae4b574e7e991f77441e02d14e27e0c8f3 /drivers/net/ethernet/broadcom/genet | |
| parent | ethernet: bnx2x: use eth_hw_addr_set() (diff) | |
| download | linux-dev-0c9e0c7931c610b9c2edce0a7a60b8de97e31885.tar.xz linux-dev-0c9e0c7931c610b9c2edce0a7a60b8de97e31885.zip | |
ethernet: bcmgenet: use eth_hw_addr_set()
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>
Diffstat (limited to 'drivers/net/ethernet/broadcom/genet')
| -rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmgenet.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index ed53859b6f7d..5da9c00b43b1 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -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"); |