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

ethernet: r8169: 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 88e102e8

drivers/net/ethernet/realtek/r8169_main.c

+2 −1
Original line number Diff line number Diff line
@@ -5217,7 +5217,7 @@ static int rtl_get_ether_clk(struct rtl8169_private *tp) 
static void rtl_init_mac_address(struct rtl8169_private *tp)

{

	struct net_device *dev = tp->dev;

	u8 *mac_addr = dev->dev_addr;

	u8 mac_addr[ETH_ALEN];

	int rc;



	rc = eth_platform_get_mac_address(tp_to_dev(tp), mac_addr);
@@ -5235,6 +5235,7 @@ static void rtl_init_mac_address(struct rtl8169_private *tp) 
	eth_hw_addr_random(dev);

	dev_warn(tp_to_dev(tp), "can't read MAC address, setting random one\n");

done:

	eth_hw_addr_set(dev, mac_addr);

	rtl_rar_set(tp, mac_addr);

}