Commit 8ec53ed9 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

ethernet: adaptec: use eth_hw_addr_set() 



Commit 406f42fa ("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: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a07a296b

drivers/net/ethernet/adaptec/starfire.c

+3 −1
Original line number Diff line number Diff line
@@ -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)