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

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

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 698c33d8

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+11 −5
Original line number Diff line number Diff line
@@ -11823,9 +11823,10 @@ static void bnx2x_get_mac_hwinfo(struct bnx2x *bp) 
	u32 val, val2;

	int func = BP_ABS_FUNC(bp);

	int port = BP_PORT(bp);

	u8 addr[ETH_ALEN] = {};



	/* Zero primary MAC configuration */

	eth_zero_addr(bp->dev->dev_addr);

	eth_hw_addr_set(bp->dev, addr);



	if (BP_NOMCP(bp)) {

		BNX2X_ERROR("warning: random MAC workaround active\n");
@@ -11834,8 +11835,10 @@ static void bnx2x_get_mac_hwinfo(struct bnx2x *bp) 
		val2 = MF_CFG_RD(bp, func_mf_config[func].mac_upper);

		val = MF_CFG_RD(bp, func_mf_config[func].mac_lower);

		if ((val2 != FUNC_MF_CFG_UPPERMAC_DEFAULT) &&

		    (val != FUNC_MF_CFG_LOWERMAC_DEFAULT))

			bnx2x_set_mac_buf(bp->dev->dev_addr, val, val2);

		    (val != FUNC_MF_CFG_LOWERMAC_DEFAULT)) {

			bnx2x_set_mac_buf(addr, val, val2);

			eth_hw_addr_set(bp->dev, addr);

		}



		if (CNIC_SUPPORT(bp))

			bnx2x_get_cnic_mac_hwinfo(bp);
@@ -11843,7 +11846,8 @@ static void bnx2x_get_mac_hwinfo(struct bnx2x *bp) 
		/* in SF read MACs from port configuration */

		val2 = SHMEM_RD(bp, dev_info.port_hw_config[port].mac_upper);

		val = SHMEM_RD(bp, dev_info.port_hw_config[port].mac_lower);

		bnx2x_set_mac_buf(bp->dev->dev_addr, val, val2);

		bnx2x_set_mac_buf(addr, val, val2);

		eth_hw_addr_set(bp->dev, addr);



		if (CNIC_SUPPORT(bp))

			bnx2x_get_cnic_mac_hwinfo(bp);
@@ -12291,7 +12295,9 @@ static int bnx2x_init_bp(struct bnx2x *bp) 
		if (rc)

			return rc;

	} else {

		eth_zero_addr(bp->dev->dev_addr);

		static const u8 zero_addr[ETH_ALEN] = {};



		eth_hw_addr_set(bp->dev, zero_addr);

	}



	bnx2x_set_modes_bitmap(bp);