diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2021-10-22 10:16:22 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-10-22 10:16:24 -0700 |
| commit | 07591ebec3cf2d6b78cb9b51a5a6f3ca731ec375 (patch) | |
| tree | 6fee94dcb692caf04b04f6cf8d5bf9b0757c1c93 /drivers/net/usb/usbnet.c | |
| parent | mlx5: fix build after merge (diff) | |
| parent | net: hldc_fr: use dev_addr_set() (diff) | |
| download | linux-dev-07591ebec3cf2d6b78cb9b51a5a6f3ca731ec375.tar.xz linux-dev-07591ebec3cf2d6b78cb9b51a5a6f3ca731ec375.zip | |
Merge branch 'net-don-t-write-directly-to-netdev-dev_addr'
Don't write directly to netdev->dev_addr.
More conversions, mostly in usb/net.
v2: leave out catc (patch 4)
Link: https://lore.kernel.org/r/20211021131214.2032925-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/usb/usbnet.c')
| -rw-r--r-- | drivers/net/usb/usbnet.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 80432ee0ce69..350bae673ed4 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -165,12 +165,13 @@ EXPORT_SYMBOL_GPL(usbnet_get_endpoints); int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress) { + u8 addr[ETH_ALEN]; int tmp = -1, ret; unsigned char buf [13]; ret = usb_string(dev->udev, iMACAddress, buf, sizeof buf); if (ret == 12) - tmp = hex2bin(dev->net->dev_addr, buf, 6); + tmp = hex2bin(addr, buf, 6); if (tmp < 0) { dev_dbg(&dev->udev->dev, "bad MAC string %d fetch, %d\n", iMACAddress, tmp); @@ -178,6 +179,7 @@ int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress) ret = -EINVAL; return ret; } + eth_hw_addr_set(dev->net, addr); return 0; } EXPORT_SYMBOL_GPL(usbnet_get_ethernet_addr); @@ -1726,7 +1728,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) dev->net = net; strscpy(net->name, "usb%d", sizeof(net->name)); - memcpy (net->dev_addr, node_id, sizeof node_id); + eth_hw_addr_set(net, node_id); /* rx and tx sides can use different message sizes; * bind() should set rx_urb_size in that case. |