ethernet: mv643xx: 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/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index a63d9a5c805937484693f61fc3dfb567d4d83133..bb14fa2241a36ef3653050e74265cc0bd94e5929 100644 (file)
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -2925,10 +2925,14 @@ static void set_params(struct mv643xx_eth_private *mp,
        struct net_device *dev = mp->dev;
        unsigned int tx_ring_size;
 
-       if (is_valid_ether_addr(pd->mac_addr))
+       if (is_valid_ether_addr(pd->mac_addr)) {
                eth_hw_addr_set(dev, pd->mac_addr);
-       else
-               uc_addr_get(mp, dev->dev_addr);
+       } else {
+               u8 addr[ETH_ALEN];
+
+               uc_addr_get(mp, addr);
+               eth_hw_addr_set(dev, addr);
+       }
 
        mp->rx_ring_size = DEFAULT_RX_QUEUE_SIZE;
        if (pd->rx_queue_size)