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() for dev->addr_len cases

Convert usb drivers from memcpy(... dev->addr_len)
to eth_hw_addr_set():

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

Manually checked these are either usbnet or pure etherdevs.

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
49ed8dde a05e4c0a

+5 -5
+1 -1
drivers/net/usb/dm9601.c
··· 331 331 return -EINVAL; 332 332 } 333 333 334 - memcpy(net->dev_addr, addr->sa_data, net->addr_len); 334 + eth_hw_addr_set(net, addr->sa_data); 335 335 __dm9601_set_mac_address(dev); 336 336 337 337 return 0;
+1 -1
drivers/net/usb/mcs7830.c
··· 159 159 return ret; 160 160 161 161 /* it worked --> adopt it on netdev side */ 162 - memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); 162 + eth_hw_addr_set(netdev, addr->sa_data); 163 163 164 164 return 0; 165 165 }
+1 -1
drivers/net/usb/r8152.c
··· 1570 1570 1571 1571 mutex_lock(&tp->control); 1572 1572 1573 - memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); 1573 + eth_hw_addr_set(netdev, addr->sa_data); 1574 1574 1575 1575 ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG); 1576 1576 pla_ocp_write(tp, PLA_IDR, BYTE_EN_SIX_BYTES, 8, addr->sa_data);
+1 -1
drivers/net/usb/rtl8150.c
··· 278 278 if (netif_running(netdev)) 279 279 return -EBUSY; 280 280 281 - memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); 281 + eth_hw_addr_set(netdev, addr->sa_data); 282 282 netdev_dbg(netdev, "Setting MAC address to %pM\n", netdev->dev_addr); 283 283 /* Set the IDR registers. */ 284 284 set_registers(dev, IDR, netdev->addr_len, netdev->dev_addr);
+1 -1
drivers/net/usb/sr9700.c
··· 296 296 return -EINVAL; 297 297 } 298 298 299 - memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); 299 + eth_hw_addr_set(netdev, addr->sa_data); 300 300 sr_write_async(dev, SR_PAR, 6, netdev->dev_addr); 301 301 302 302 return 0;