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

net: use eth_hw_addr_set() instead of ether_addr_copy() 



Convert from ether_addr_copy() to eth_hw_addr_set():

  @@
  expression dev, np;
  @@
  - ether_addr_copy(dev->dev_addr, np)
  + 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 16813717

drivers/net/ipvlan/ipvlan_main.c

+1 −1
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ static int ipvlan_device_event(struct notifier_block *unused, 


	case NETDEV_CHANGEADDR:

		list_for_each_entry(ipvlan, &port->ipvlans, pnode) {

			ether_addr_copy(ipvlan->dev->dev_addr, dev->dev_addr);

			eth_hw_addr_set(ipvlan->dev, dev->dev_addr);

			call_netdevice_notifiers(NETDEV_CHANGEADDR, ipvlan->dev);

		}

		break;

drivers/net/macsec.c

+1 −1
Original line number Diff line number Diff line
@@ -3614,7 +3614,7 @@ static int macsec_set_mac_address(struct net_device *dev, void *p) 
	dev_uc_del(real_dev, dev->dev_addr);



out:

	ether_addr_copy(dev->dev_addr, addr->sa_data);

	eth_hw_addr_set(dev, addr->sa_data);

	macsec->secy.sci = dev_to_sci(dev, MACSEC_PORT_ES);



	/* If h/w offloading is available, propagate to the device */

drivers/net/macvlan.c

+1 −1
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ static int macvlan_sync_address(struct net_device *dev, unsigned char *addr) 


	if (!(dev->flags & IFF_UP)) {

		/* Just copy in the new address */

		ether_addr_copy(dev->dev_addr, addr);

		eth_hw_addr_set(dev, addr);

	} else {

		/* Rehash and update the device filters */

		if (macvlan_addr_busy(vlan->port, addr))

net/8021q/vlan_dev.c

+3 −3
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ bool vlan_dev_inherit_address(struct net_device *dev, 
	if (dev->addr_assign_type != NET_ADDR_STOLEN)

		return false;



	ether_addr_copy(dev->dev_addr, real_dev->dev_addr);

	eth_hw_addr_set(dev, real_dev->dev_addr);

	call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);

	return true;

}
@@ -349,7 +349,7 @@ static int vlan_dev_set_mac_address(struct net_device *dev, void *p) 
		dev_uc_del(real_dev, dev->dev_addr);



out:

	ether_addr_copy(dev->dev_addr, addr->sa_data);

	eth_hw_addr_set(dev, addr->sa_data);

	return 0;

}
@@ -586,7 +586,7 @@ static int vlan_dev_init(struct net_device *dev) 
	dev->dev_id = real_dev->dev_id;



	if (is_zero_ether_addr(dev->dev_addr)) {

		ether_addr_copy(dev->dev_addr, real_dev->dev_addr);

		eth_hw_addr_set(dev, real_dev->dev_addr);

		dev->addr_assign_type = NET_ADDR_STOLEN;

	}

	if (is_zero_ether_addr(dev->broadcast))

net/dsa/slave.c

+2 −2
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int dsa_slave_set_mac_address(struct net_device *dev, void *a) 
		dev_uc_del(master, dev->dev_addr);



out:

	ether_addr_copy(dev->dev_addr, addr->sa_data);

	eth_hw_addr_set(dev, addr->sa_data);



	return 0;

}
@@ -1954,7 +1954,7 @@ int dsa_slave_create(struct dsa_port *port) 


	slave_dev->ethtool_ops = &dsa_slave_ethtool_ops;

	if (!is_zero_ether_addr(port->mac))

		ether_addr_copy(slave_dev->dev_addr, port->mac);

		eth_hw_addr_set(slave_dev, port->mac);

	else

		eth_hw_addr_inherit(slave_dev, master);

	slave_dev->priv_flags |= IFF_NO_QUEUE;