ethernet: stmmac: 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>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index b720539ccb0aaeb1c31d5dfca8c66c7f890658ee..88d3053d2f877e0d1847bda8573e191e5e12cd57 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2818,9 +2818,13 @@ static int stmmac_get_hw_features(struct stmmac_priv *priv)
  */
 static void stmmac_check_ether_addr(struct stmmac_priv *priv)
 {
+       u8 addr[ETH_ALEN];
+
        if (!is_valid_ether_addr(priv->dev->dev_addr)) {
-               stmmac_get_umac_addr(priv, priv->hw, priv->dev->dev_addr, 0);
-               if (!is_valid_ether_addr(priv->dev->dev_addr))
+               stmmac_get_umac_addr(priv, priv->hw, 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",
                         priv->dev->dev_addr);