Commit 16813717 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

net: usb: 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.

Convert usb drivers from memcpy(... ETH_ADDR) to eth_hw_addr_set():

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

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a96d317f

drivers/net/usb/asix_common.c

+1 −1
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ int asix_set_mac_address(struct net_device *net, void *p) 
	if (!is_valid_ether_addr(addr->sa_data))

		return -EADDRNOTAVAIL;



	memcpy(net->dev_addr, addr->sa_data, ETH_ALEN);

	eth_hw_addr_set(net, addr->sa_data);



	/* We use the 20 byte dev->data

	 * for our 6 byte mac buffer

drivers/net/usb/asix_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static void asix_status(struct usbnet *dev, struct urb *urb) 
static void asix_set_netdev_dev_addr(struct usbnet *dev, u8 *addr)

{

	if (is_valid_ether_addr(addr)) {

		memcpy(dev->net->dev_addr, addr, ETH_ALEN);

		eth_hw_addr_set(dev->net, addr);

	} else {

		netdev_info(dev->net, "invalid hw address, using random\n");

		eth_hw_addr_random(dev->net);

drivers/net/usb/ax88172a.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf) 
		ret = -EIO;

		goto free;

	}

	memcpy(dev->net->dev_addr, buf, ETH_ALEN);

	eth_hw_addr_set(dev->net, buf);



	dev->net->netdev_ops = &ax88172a_netdev_ops;

	dev->net->ethtool_ops = &ax88172a_ethtool_ops;

drivers/net/usb/ax88179_178a.c

+2 −2
Original line number Diff line number Diff line
@@ -1015,7 +1015,7 @@ static int ax88179_set_mac_addr(struct net_device *net, void *p) 
	if (!is_valid_ether_addr(addr->sa_data))

		return -EADDRNOTAVAIL;



	memcpy(net->dev_addr, addr->sa_data, ETH_ALEN);

	eth_hw_addr_set(net, addr->sa_data);



	/* Set the MAC address */

	ret = ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_NODE_ID, ETH_ALEN,
@@ -1310,7 +1310,7 @@ static void ax88179_get_mac_addr(struct usbnet *dev) 
	}



	if (is_valid_ether_addr(mac)) {

		memcpy(dev->net->dev_addr, mac, ETH_ALEN);

		eth_hw_addr_set(dev->net, mac);

	} else {

		netdev_info(dev->net, "invalid MAC address, using random\n");

		eth_hw_addr_random(dev->net);

drivers/net/usb/dm9601.c

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf) 
	 * Overwrite the auto-generated address only with good ones.

	 */

	if (is_valid_ether_addr(mac))

		memcpy(dev->net->dev_addr, mac, ETH_ALEN);

		eth_hw_addr_set(dev->net, mac);

	else {

		printk(KERN_WARNING

			"dm9601: No valid MAC address in EEPROM, using %pM\n",