net: use eth_hw_addr_set() instead of ether_addr_copy()

[ Upstream commit e35b8d7dbb094c79daf920797c372911edc2d525 ]

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: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index c0b21a5..3f43c25 100644 (file)
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -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;

diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index 3548909..0a860cb 100644 (file)
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -3616,7 +3616,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 */

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index a9a515c..6363459 100644 (file)
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -711,7 +711,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))

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 8602885..a54535c 100644 (file)
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -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))

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index a2bf2d8..11ec9e6 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -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;

diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c
index ea7b96e..a1045c3 100644 (file)
--- a/net/hsr/hsr_device.c
+++ b/net/hsr/hsr_device.c
@@ -493,7 +493,7 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2],
        INIT_LIST_HEAD(&hsr->self_node_db);
        spin_lock_init(&hsr->list_lock);
 
-       ether_addr_copy(hsr_dev->dev_addr, slave[0]->dev_addr);
+       eth_hw_addr_set(hsr_dev, slave[0]->dev_addr);
 
        /* initialize protocol specific functions */
        if (protocol_version == PRP_V1) {

diff --git a/net/hsr/hsr_main.c b/net/hsr/hsr_main.c
index f7e284f..b099c31 100644 (file)
--- a/net/hsr/hsr_main.c
+++ b/net/hsr/hsr_main.c
@@ -75,7 +75,7 @@ static int hsr_netdev_notify(struct notifier_block *nb, unsigned long event,
                master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);
 
                if (port->type == HSR_PT_SLAVE_A) {
-                       ether_addr_copy(master->dev->dev_addr, dev->dev_addr);
+                       eth_hw_addr_set(master->dev, dev->dev_addr);
                        call_netdevice_notifiers(NETDEV_CHANGEADDR,
                                                 master->dev);
                }