diff options
author | Jakub Kicinski <kuba@kernel.org> | 2021-10-18 16:50:21 -0700 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2021-10-20 12:39:47 +0300 |
commit | 2ad96cb5b4f45f666e2f911e990cbbb957a51d93 (patch) | |
tree | 93ced295eede73e746cc1c1cd57876d5e24ffedb | |
parent | 18774612246d036c04ce9fee7f67192f96f48725 (diff) | |
download | linux-2ad96cb5b4f45f666e2f911e990cbbb957a51d93.tar.gz linux-2ad96cb5b4f45f666e2f911e990cbbb957a51d93.tar.bz2 linux-2ad96cb5b4f45f666e2f911e990cbbb957a51d93.zip |
zd1201: use eth_hw_addr_set()
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.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20211018235021.1279697-16-kuba@kernel.org
-rw-r--r-- | drivers/net/wireless/zydas/zd1201.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/zydas/zd1201.c b/drivers/net/wireless/zydas/zd1201.c index 6b735fee7b18..e64e4e579518 100644 --- a/drivers/net/wireless/zydas/zd1201.c +++ b/drivers/net/wireless/zydas/zd1201.c @@ -507,7 +507,7 @@ static int zd1201_getconfig(struct zd1201 *zd, int rid, void *riddata, * byte data[12] * total: 16 */ -static int zd1201_setconfig(struct zd1201 *zd, int rid, void *buf, int len, int wait) +static int zd1201_setconfig(struct zd1201 *zd, int rid, const void *buf, int len, int wait) { int err; unsigned char *request; @@ -1729,6 +1729,7 @@ static int zd1201_probe(struct usb_interface *interface, int err; short porttype; char buf[IW_ESSID_MAX_SIZE+2]; + u8 addr[ETH_ALEN]; usb = interface_to_usbdev(interface); @@ -1779,10 +1780,10 @@ static int zd1201_probe(struct usb_interface *interface, dev->watchdog_timeo = ZD1201_TX_TIMEOUT; strcpy(dev->name, "wlan%d"); - err = zd1201_getconfig(zd, ZD1201_RID_CNFOWNMACADDR, - dev->dev_addr, dev->addr_len); + err = zd1201_getconfig(zd, ZD1201_RID_CNFOWNMACADDR, addr, ETH_ALEN); if (err) goto err_start; + eth_hw_addr_set(dev, addr); /* Set wildcard essid to match zd->essid */ *(__le16 *)buf = cpu_to_le16(0); |