Skip to content

Commit

Permalink
zd1201: use eth_hw_addr_set()
Browse files Browse the repository at this point in the history
Commit 406f42f ("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
  • Loading branch information
Jakub Kicinski authored and Kalle Valo committed Oct 20, 2021
1 parent 1877461 commit 2ad96cb
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/net/wireless/zydas/zd1201.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 2ad96cb

Please sign in to comment.