Commit 15fa05bf authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

ethernet: sxgbe: 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 298b0e0c

drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c

+6 −3
Original line number Diff line number Diff line
@@ -931,10 +931,13 @@ static int sxgbe_get_hw_features(struct sxgbe_priv_data * const priv) 
static void sxgbe_check_ether_addr(struct sxgbe_priv_data *priv)

{

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

		u8 addr[ETH_ALEN];



		priv->hw->mac->get_umac_addr((void __iomem *)

					     priv->ioaddr,

					     priv->dev->dev_addr, 0);

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

					     priv->ioaddr, addr, 0);

		if (is_valid_ether_addr(addr))

			eth_hw_addr_set(priv->dev, addr);

		else

			eth_hw_addr_random(priv->dev);

	}

	dev_info(priv->device, "device MAC address %pM\n",