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

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

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: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 10e6ded8

drivers/net/ethernet/freescale/enetc/enetc_hw.h

+5 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/ethernet/freescale/enetc/enetc_pf.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/net/ethernet/freescale/enetc/enetc_vf.c

+1 −1
Original line number Diff line number Diff line
@@ -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,