ethernet: enetc: 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.

Pass a netdev into the helper instead of just the address,
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/freescale/enetc/enetc_hw.h b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
index 0f5f081a5bafe8bc7920b47fec48b19eac3830b4..1514e6a4a3ff780feb4e2e16cf8c02af98579995 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
@@ -635,10 +635,14 @@ struct enetc_cmd_rfse {
 #define ENETC_RFSE_EN  BIT(15)
 #define ENETC_RFSE_MODE_BD     2
 
-static inline void enetc_get_primary_mac_addr(struct enetc_hw *hw, u8 *addr)
+static inline void enetc_load_primary_mac_addr(struct enetc_hw *hw,
+                                              struct net_device *ndev)
 {
+       u8 addr[ETH_ALEN] __aligned(4);
+
        *(u32 *)addr = __raw_readl(hw->reg + ENETC_SIPMAR0);
        *(u16 *)(addr + 4) = __raw_readw(hw->reg + ENETC_SIPMAR1);
+       eth_hw_addr_set(ndev, addr);
 }
 
 #define ENETC_SI_INT_IDX       0

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
index 8281dd664f4e6a564057427e81ca2ee37d6947d9..ead2b93bf614250a5fa7b4fab427d68937a81bb8 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
@@ -783,7 +783,7 @@ static void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
        }
 
        /* pick up primary MAC address from SI */
-       enetc_get_primary_mac_addr(&si->hw, ndev->dev_addr);
+       enetc_load_primary_mac_addr(&si->hw, ndev);
 }
 
 static int enetc_mdio_probe(struct enetc_pf *pf, struct device_node *np)

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_vf.c b/drivers/net/ethernet/freescale/enetc/enetc_vf.c
index df312c9f82436f5d0505a4a6643d1f9bf53ee413..17924305afa2f1a916a8a141219643c2490dedf1 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_vf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_vf.c
@@ -135,7 +135,7 @@ static void enetc_vf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
                ndev->hw_features |= NETIF_F_RXHASH;
 
        /* pick up primary MAC address from SI */
-       enetc_get_primary_mac_addr(&si->hw, ndev->dev_addr);
+       enetc_load_primary_mac_addr(&si->hw, ndev);
 }
 
 static int enetc_vf_probe(struct pci_dev *pdev,