Commit 2ad96cb5 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Kalle Valo
Browse files

zd1201: use eth_hw_addr_set()



Commit 406f42fa ("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: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20211018235021.1279697-16-kuba@kernel.org
parent 18774612
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -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);