diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-10-15 15:16:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-16 08:53:46 +0100 |
| commit | 10e6ded812357ad5ae754bd994521beca091c0b4 (patch) | |
| tree | 5fe9f08fe59e678067c132db683f67e7dff676a6 /drivers/net/ethernet/ec_bhf.c | |
| parent | 41edfff572d9ed0a9b8f8d136f2cfa213244746e (diff) | |
| download | lwn-10e6ded812357ad5ae754bd994521beca091c0b4.tar.gz lwn-10e6ded812357ad5ae754bd994521beca091c0b4.zip | |
ethernet: ec_bhf: 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.
Copy 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/ec_bhf.c')
| -rw-r--r-- | drivers/net/ethernet/ec_bhf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ec_bhf.c b/drivers/net/ethernet/ec_bhf.c index b2d4fb3feb74..46e3a05e9582 100644 --- a/drivers/net/ethernet/ec_bhf.c +++ b/drivers/net/ethernet/ec_bhf.c @@ -479,6 +479,7 @@ static int ec_bhf_probe(struct pci_dev *dev, const struct pci_device_id *id) struct net_device *net_dev; struct ec_bhf_priv *priv; void __iomem *dma_io; + u8 addr[ETH_ALEN]; void __iomem *io; int err = 0; @@ -539,7 +540,8 @@ static int ec_bhf_probe(struct pci_dev *dev, const struct pci_device_id *id) if (err < 0) goto err_free_net_dev; - memcpy_fromio(net_dev->dev_addr, priv->mii_io + MII_MAC_ADDR, 6); + memcpy_fromio(addr, priv->mii_io + MII_MAC_ADDR, ETH_ALEN); + eth_hw_addr_set(net_dev, addr); err = register_netdev(net_dev); if (err < 0) |