Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: usb: use eth_hw_addr_set() instead of ether_addr_copy()

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.

Convert net/usb from ether_addr_copy() to eth_hw_addr_set():

@@
expression dev, np;
@@
- ether_addr_copy(dev->dev_addr, np)
+ eth_hw_addr_set(dev, np)

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jakub Kicinski and committed by
David S. Miller
af804e6d f3956ebb

+6 -6
+1 -1
drivers/net/usb/aqc111.c
··· 714 714 if (ret) 715 715 goto out; 716 716 717 - ether_addr_copy(dev->net->dev_addr, dev->net->perm_addr); 717 + eth_hw_addr_set(dev->net, dev->net->perm_addr); 718 718 719 719 /* Set Rx urb size */ 720 720 dev->rx_urb_size = URB_SIZE;
+2 -2
drivers/net/usb/lan78xx.c
··· 1817 1817 lan78xx_write_reg(dev, MAF_LO(0), addr_lo); 1818 1818 lan78xx_write_reg(dev, MAF_HI(0), addr_hi | MAF_HI_VALID_); 1819 1819 1820 - ether_addr_copy(dev->net->dev_addr, addr); 1820 + eth_hw_addr_set(dev->net, addr); 1821 1821 } 1822 1822 1823 1823 /* MDIO read and write wrappers for phylib */ ··· 2416 2416 if (!is_valid_ether_addr(addr->sa_data)) 2417 2417 return -EADDRNOTAVAIL; 2418 2418 2419 - ether_addr_copy(netdev->dev_addr, addr->sa_data); 2419 + eth_hw_addr_set(netdev, addr->sa_data); 2420 2420 2421 2421 addr_lo = netdev->dev_addr[0] | 2422 2422 netdev->dev_addr[1] << 8 |
+1 -1
drivers/net/usb/r8152.c
··· 1718 1718 return ret; 1719 1719 1720 1720 if (tp->version == RTL_VER_01) 1721 - ether_addr_copy(dev->dev_addr, sa.sa_data); 1721 + eth_hw_addr_set(dev, sa.sa_data); 1722 1722 else 1723 1723 ret = __rtl8152_set_mac_address(dev, &sa, in_resume); 1724 1724
+1 -1
drivers/net/usb/rndis_host.c
··· 421 421 if (bp[0] & 0x02) 422 422 eth_hw_addr_random(net); 423 423 else 424 - ether_addr_copy(net->dev_addr, bp); 424 + eth_hw_addr_set(net, bp); 425 425 426 426 /* set a nonzero filter to enable data transfers */ 427 427 memset(u.set, 0, sizeof *u.set);
+1 -1
drivers/net/usb/rtl8150.c
··· 262 262 ret = get_registers(dev, IDR, sizeof(node_id), node_id); 263 263 264 264 if (!ret) { 265 - ether_addr_copy(dev->netdev->dev_addr, node_id); 265 + eth_hw_addr_set(dev->netdev, node_id); 266 266 } else { 267 267 eth_hw_addr_random(dev->netdev); 268 268 netdev_notice(dev->netdev, "Assigned a random MAC address: %pM\n",