leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ethernet: r8169: use eth_hw_addr_set()

Browse Source 
Commit 406f42fa0d ("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>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2021-10-18 07:29:25 -07:00 committed by David S. Miller
parent 88e102e877
commit 1c5d09d587
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/realtek/r8169_main.c
View File

@ -5217,7 +5217,7 @@ static int rtl_get_ether_clk(struct rtl8169_private *tp)
static void rtl_init_mac_address(struct rtl8169_private *tp) static void rtl_init_mac_address(struct rtl8169_private *tp)
{ {
struct net_device *dev = tp->dev; struct net_device *dev = tp->dev;
u8 *mac_addr = dev->dev_addr; u8 mac_addr[ETH_ALEN];
int rc; int rc;
rc = eth_platform_get_mac_address(tp_to_dev(tp), mac_addr); 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); eth_hw_addr_random(dev);
dev_warn(tp_to_dev(tp), "can't read MAC address, setting random one\n"); dev_warn(tp_to_dev(tp), "can't read MAC address, setting random one\n");
done: done:
eth_hw_addr_set(dev, mac_addr);
rtl_rar_set(tp, mac_addr); rtl_rar_set(tp, mac_addr);
} }