ethernet: sky2/skge: 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>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index ac48dcca268ca3c98d1cf63119fba4b0ee77af99..0c864e5bf0a64115571776e899ba889154d78227 100644 (file)
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -3810,6 +3810,7 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
 {
        struct skge_port *skge;
        struct net_device *dev = alloc_etherdev(sizeof(*skge));
+       u8 addr[ETH_ALEN];
 
        if (!dev)
                return NULL;
@@ -3862,7 +3863,8 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
        }
 
        /* read the mac address */
-       memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port*8, ETH_ALEN);
+       memcpy_fromio(addr, hw->regs + B2_MAC_1 + port*8, ETH_ALEN);
+       eth_hw_addr_set(dev, addr);
 
        return dev;
 }

diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 0da18b3f1c017a0088714600f56dd4f73965bea4..5abb55191e8e99e01bcfe132fc16a7bb49e749f9 100644 (file)
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -4721,9 +4721,12 @@ static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port,
         * 2) from internal registers set by bootloader
         */
        ret = of_get_ethdev_address(hw->pdev->dev.of_node, dev);
-       if (ret)
-               memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8,
-                             ETH_ALEN);
+       if (ret) {
+               u8 addr[ETH_ALEN];
+
+               memcpy_fromio(addr, hw->regs + B2_MAC_1 + port * 8, ETH_ALEN);
+               eth_hw_addr_set(dev, addr);
+       }
 
        /* if the address is invalid, use a random value */
        if (!is_valid_ether_addr(dev->dev_addr)) {