Commit 83f262ba authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

ethernet: via-rhine: 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 41a19eb0

drivers/net/ethernet/via/via-rhine.c

+3 −1
Original line number Diff line number Diff line
@@ -899,6 +899,7 @@ static int rhine_init_one_common(struct device *hwdev, u32 quirks, 
	struct net_device *dev;

	struct rhine_private *rp;

	int i, rc, phy_id;

	u8 addr[ETH_ALEN];

	const char *name;



	/* this should always be supported */
@@ -933,7 +934,8 @@ static int rhine_init_one_common(struct device *hwdev, u32 quirks, 
	rhine_hw_init(dev, pioaddr);



	for (i = 0; i < 6; i++)

		dev->dev_addr[i] = ioread8(ioaddr + StationAddr + i);

		addr[i] = ioread8(ioaddr + StationAddr + i);

	eth_hw_addr_set(dev, addr);



	if (!is_valid_ether_addr(dev->dev_addr)) {

		/* Report it and use a random ethernet address instead */