diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2021-10-18 07:29:22 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-10-19 12:41:47 +0100 |
| commit | 4789b57af37f75024e02954dba23bebe25b7133a (patch) | |
| tree | 0544bfbd9896d65b6d52405c08ae73296487d7d3 /drivers/net/ethernet/marvell/sky2.c | |
| parent | ethernet: mv643xx: use eth_hw_addr_set() (diff) | |
| download | linux-dev-4789b57af37f75024e02954dba23bebe25b7133a.tar.xz linux-dev-4789b57af37f75024e02954dba23bebe25b7133a.zip | |
ethernet: sky2/skge: 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>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell/sky2.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/sky2.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index 0da18b3f1c01..5abb55191e8e 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -4721,9 +4721,12 @@ static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port, * 2) from internal registers set by bootloader */ ret = of_get_ethdev_address(hw->pdev->dev.of_node, dev); - if (ret) - memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8, - ETH_ALEN); + if (ret) { + u8 addr[ETH_ALEN]; + + memcpy_fromio(addr, hw->regs + B2_MAC_1 + port * 8, ETH_ALEN); + eth_hw_addr_set(dev, addr); + } /* if the address is invalid, use a random value */ if (!is_valid_ether_addr(dev->dev_addr)) { |