diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2021-10-15 15:16:41 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-10-16 08:53:45 +0100 |
| commit | 8ec53ed9af1f7baa8f359bfd0286c59dbc7bdb41 (patch) | |
| tree | 894c329b412990277482e6fa3adf0c0a4f2a3599 /drivers/net/ethernet/adaptec | |
| parent | net: ipvtap: fix template string argument of device_create() call (diff) | |
| download | linux-dev-8ec53ed9af1f7baa8f359bfd0286c59dbc7bdb41.tar.xz linux-dev-8ec53ed9af1f7baa8f359bfd0286c59dbc7bdb41.zip | |
ethernet: adaptec: 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/adaptec')
| -rw-r--r-- | drivers/net/ethernet/adaptec/starfire.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c index 16b6b83f670b..c6982f7caf9b 100644 --- a/drivers/net/ethernet/adaptec/starfire.c +++ b/drivers/net/ethernet/adaptec/starfire.c @@ -641,6 +641,7 @@ static int starfire_init_one(struct pci_dev *pdev, struct netdev_private *np; int i, irq, chip_idx = ent->driver_data; struct net_device *dev; + u8 addr[ETH_ALEN]; long ioaddr; void __iomem *base; int drv_flags, io_size; @@ -696,7 +697,8 @@ static int starfire_init_one(struct pci_dev *pdev, /* Serial EEPROM reads are hidden by the hardware. */ for (i = 0; i < 6; i++) - dev->dev_addr[i] = readb(base + EEPROMCtrl + 20 - i); + addr[i] = readb(base + EEPROMCtrl + 20 - i); + eth_hw_addr_set(dev, addr); #if ! defined(final_version) /* Dump the EEPROM contents during development. */ if (debug > 4) |