ethernet: use eth_hw_addr_set() instead of ether_addr_copy()

Convert Ethernet 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>

diff --git a/drivers/net/ethernet/agere/et131x.c b/drivers/net/ethernet/agere/et131x.c
index 920633161174d5cac550cf5ea8b488c10d9daad1..f4edc616388c04362136295fc82f04b65df17774 100644 (file)
--- a/drivers/net/ethernet/agere/et131x.c
+++ b/drivers/net/ethernet/agere/et131x.c
@@ -3863,7 +3863,7 @@ static int et131x_change_mtu(struct net_device *netdev, int new_mtu)
 
        et131x_init_send(adapter);
        et131x_hwaddr_init(adapter);
-       ether_addr_copy(netdev->dev_addr, adapter->addr);
+       eth_hw_addr_set(netdev, adapter->addr);
 
        /* Init the device with the new settings */
        et131x_adapter_setup(adapter);
@@ -3966,7 +3966,7 @@ static int et131x_pci_setup(struct pci_dev *pdev,
 
        netif_napi_add(netdev, &adapter->napi, et131x_poll, 64);
 
-       ether_addr_copy(netdev->dev_addr, adapter->addr);
+       eth_hw_addr_set(netdev, adapter->addr);
 
        rc = -ENOMEM;
 

diff --git a/drivers/net/ethernet/alacritech/slicoss.c b/drivers/net/ethernet/alacritech/slicoss.c
index 696517eae77f0aeae178181c52d4b39021bc16f8..82f4f26081021cbfaab87f985d74b21b18e04551 100644 (file)
--- a/drivers/net/ethernet/alacritech/slicoss.c
+++ b/drivers/net/ethernet/alacritech/slicoss.c
@@ -1660,7 +1660,7 @@ static int slic_read_eeprom(struct slic_device *sdev)
                goto free_eeprom;
        }
        /* set mac address */
-       ether_addr_copy(sdev->netdev->dev_addr, mac[devfn]);
+       eth_hw_addr_set(sdev->netdev, mac[devfn]);
 free_eeprom:
        dma_free_coherent(&sdev->pdev->dev, SLIC_EEPROM_SIZE, eeprom, paddr);
 

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index 0e43000614abd9823d4441fcd2937cd7a96db1fa..7d5d885d85d5ed9304798358221e11b11123c982 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -4073,7 +4073,7 @@ static void ena_set_conf_feat_params(struct ena_adapter *adapter,
                ether_addr_copy(adapter->mac_addr, netdev->dev_addr);
        } else {
                ether_addr_copy(adapter->mac_addr, feat->dev_attr.mac_addr);
-               ether_addr_copy(netdev->dev_addr, adapter->mac_addr);
+               eth_hw_addr_set(netdev, adapter->mac_addr);
        }
 
        /* Set offload features */

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
index 6c049864dac0812cae377adadc366c3db5ffda63..694aa70bcafe50a21f70f309650936bc155013e8 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
@@ -332,7 +332,7 @@ int aq_nic_ndev_register(struct aq_nic_s *self)
        {
                static u8 mac_addr_permanent[] = AQ_CFG_MAC_ADDR_PERMANENT;
 
-               ether_addr_copy(self->ndev->dev_addr, mac_addr_permanent);
+               eth_hw_addr_set(self->ndev, mac_addr_permanent);
        }
 #endif
 

diff --git a/drivers/net/ethernet/broadcom/bgmac-bcma.c b/drivers/net/ethernet/broadcom/bgmac-bcma.c
index 9513cfb5ba58c3d41a4198f2516223cf7c858062..28759062d68dda8bbf0c42cd18cc4333d8fa112f 100644 (file)
--- a/drivers/net/ethernet/broadcom/bgmac-bcma.c
+++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c
@@ -150,7 +150,7 @@ static int bgmac_probe(struct bcma_device *core)
                        err = -ENOTSUPP;
                        goto err;
                }
-               ether_addr_copy(bgmac->net_dev->dev_addr, mac);
+               eth_hw_addr_set(bgmac->net_dev, mac);
        }
 
        /* On BCM4706 we need common core to access PHY */

diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index fe4d99abd54876ed4a2de109429861f6460aeead..d2c7834850cc413ed761ca3cbb7edfcae1ead091 100644 (file)
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -1241,7 +1241,7 @@ static int bgmac_set_mac_address(struct net_device *net_dev, void *addr)
        if (ret < 0)
                return ret;
 
-       ether_addr_copy(net_dev->dev_addr, sa->sa_data);
+       eth_hw_addr_set(net_dev, sa->sa_data);
        bgmac_write_mac_address(bgmac, net_dev->dev_addr);
 
        eth_commit_mac_addr_change(net_dev, addr);

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c
index 9401936b74fa2959f021acd64d2ab86fd8552f26..8eb28e088582069c9e648b2424b1c448e49efe48 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c
@@ -475,7 +475,7 @@ static void bnxt_vf_rep_netdev_init(struct bnxt *bp, struct bnxt_vf_rep *vf_rep,
        dev->features |= pf_dev->features;
        bnxt_vf_rep_eth_addr_gen(bp->pf.mac_addr, vf_rep->vf_idx,
                                 dev->perm_addr);
-       ether_addr_copy(dev->dev_addr, dev->perm_addr);
+       eth_hw_addr_set(dev, dev->perm_addr);
        /* Set VF-Rep's max-mtu to the corresponding VF's max-mtu */
        if (!bnxt_hwrm_vfr_qcfg(bp, vf_rep, &max_mtu))
                dev->max_mtu = max_mtu;

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 6a8234bc94283d9d06547fd790cb31ccf07ba480..02fe98cbabb03c94f9065d066c2b6f0906319a55 100644 (file)
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -3633,7 +3633,7 @@ static int bcmgenet_set_mac_addr(struct net_device *dev, void *p)
        if (netif_running(dev))
                return -EBUSY;
 
-       ether_addr_copy(dev->dev_addr, addr->sa_data);
+       eth_hw_addr_set(dev, addr->sa_data);
 
        return 0;
 }
@@ -4082,7 +4082,7 @@ static int bcmgenet_probe(struct platform_device *pdev)
                bcmgenet_power_up(priv, GENET_POWER_PASSIVE);
 
        if (pd && !IS_ERR_OR_NULL(pd->mac_address))
-               ether_addr_copy(dev->dev_addr, pd->mac_address);
+               eth_hw_addr_set(dev, pd->mac_address);
        else
                if (!device_get_mac_address(&pdev->dev, dev->dev_addr, ETH_ALEN))
                        if (has_acpi_companion(&pdev->dev))

diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index ba47777d9cff7ef2e06d8ed9072e25114e71591e..b1947fd9a07cca9fce91b641b3786f125ffdb5fe 100644 (file)
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -875,7 +875,7 @@ bnad_set_netdev_perm_addr(struct bnad *bnad)
 
        ether_addr_copy(netdev->perm_addr, bnad->perm_addr);
        if (is_zero_ether_addr(netdev->dev_addr))
-               ether_addr_copy(netdev->dev_addr, bnad->perm_addr);
+               eth_hw_addr_set(netdev, bnad->perm_addr);
 }
 
 /* Control Path Handlers */
@@ -3249,7 +3249,7 @@ bnad_set_mac_address(struct net_device *netdev, void *addr)
 
        err = bnad_mac_addr_set_locked(bnad, sa->sa_data);
        if (!err)
-               ether_addr_copy(netdev->dev_addr, sa->sa_data);
+               eth_hw_addr_set(netdev, sa->sa_data);
 
        spin_unlock_irqrestore(&bnad->bna_lock, flags);
 

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_core.c b/drivers/net/ethernet/cavium/liquidio/lio_core.c
index 2a0d64e5797c87a6ce65bd1878e5600eca720e4d..ec7928b54e4a785d432c279f7d3a7bf0417487a4 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_core.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_core.c
@@ -411,7 +411,7 @@ void octeon_pf_changed_vf_macaddr(struct octeon_device *oct, u8 *mac)
 
        if (!ether_addr_equal(netdev->dev_addr, mac)) {
                macaddr_changed = true;
-               ether_addr_copy(netdev->dev_addr, mac);
+               eth_hw_addr_set(netdev, mac);
                ether_addr_copy(((u8 *)&lio->linfo.hw_addr) + 2, mac);
                call_netdevice_notifiers(NETDEV_CHANGEADDR, netdev);
        }

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index dafc79bd34f48ead6d92f5a3e17ca49e8214e7ab..5d865ba7aed42182f0c073901276dfbd5f31d076 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -3634,7 +3634,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
 
                /* Copy MAC Address to OS network device structure */
 
-               ether_addr_copy(netdev->dev_addr, mac);
+               eth_hw_addr_set(netdev, mac);
 
                /* By default all interfaces on a single Octeon uses the same
                 * tx and rx queues

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
index f6396ac64006c7530364448024211ac9238fde65..8a969a9d4b6377466dcf1145a77f78593e88ee12 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
@@ -2148,7 +2148,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                        mac[j] = *((u8 *)(((u8 *)&lio->linfo.hw_addr) + 2 + j));
 
                /* Copy MAC Address to OS network device structure */
-               ether_addr_copy(netdev->dev_addr, mac);
+               eth_hw_addr_set(netdev, mac);
 
                if (liquidio_setup_io_queues(octeon_dev, i,
                                             lio->linfo.num_txpciq,

diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
index 2b87565781a0b2b64b5e324d3d47cf6d46607f5e..5ef704c8d839fa64da2d0faf4a38f362fc2df384 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
@@ -221,8 +221,7 @@ static void  nicvf_handle_mbx_intr(struct nicvf *nic)
                nic->tns_mode = mbx.nic_cfg.tns_mode & 0x7F;
                nic->node = mbx.nic_cfg.node_id;
                if (!nic->set_mac_pending)
-                       ether_addr_copy(nic->netdev->dev_addr,
-                                       mbx.nic_cfg.mac_addr);
+                       eth_hw_addr_set(nic->netdev, mbx.nic_cfg.mac_addr);
                nic->sqs_mode = mbx.nic_cfg.sqs_mode;
                nic->loopback_supported = mbx.nic_cfg.loopback_supported;
                nic->link_up = false;

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 0fb36d50c42bf6dfda58f8b2b6ffebe9f6b3561b..ef60e2da05a45af39d7d7be6f4bdb1f04f8f738b 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -369,7 +369,7 @@ static int be_mac_addr_set(struct net_device *netdev, void *p)
        /* Remember currently programmed MAC */
        ether_addr_copy(adapter->dev_mac, addr->sa_data);
 done:
-       ether_addr_copy(netdev->dev_addr, addr->sa_data);
+       eth_hw_addr_set(netdev, addr->sa_data);
        dev_info(dev, "MAC address changed to %pM\n", addr->sa_data);
        return 0;
 err:

diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c
index c5bd27db708a6228bbd697f93149ef09c65a2077..7eb7d28a489df5c72933d7f9c44393bcda2fd2c6 100644 (file)
--- a/drivers/net/ethernet/ethoc.c
+++ b/drivers/net/ethernet/ethoc.c
@@ -1144,7 +1144,7 @@ static int ethoc_probe(struct platform_device *pdev)
 
        /* Allow the platform setup code to pass in a MAC address. */
        if (pdata) {
-               ether_addr_copy(netdev->dev_addr, pdata->hwaddr);
+               eth_hw_addr_set(netdev, pdata->hwaddr);
                priv->phy_id = pdata->phy_id;
        } else {
                of_get_mac_address(pdev->dev.of_node, netdev->dev_addr);

diff --git a/drivers/net/ethernet/ezchip/nps_enet.c b/drivers/net/ethernet/ezchip/nps_enet.c
index f9a288a6ec8ccafebcc7184100c4195067e10ae4..f5935eb5a791c3c165c6ff5d6a4f04c5ca9927bd 100644 (file)
--- a/drivers/net/ethernet/ezchip/nps_enet.c
+++ b/drivers/net/ethernet/ezchip/nps_enet.c
@@ -421,7 +421,7 @@ static s32 nps_enet_set_mac_address(struct net_device *ndev, void *p)
 
        res = eth_mac_addr(ndev, p);
        if (!res) {
-               ether_addr_copy(ndev->dev_addr, addr->sa_data);
+               eth_hw_addr_set(ndev, addr->sa_data);
                nps_enet_set_hw_mac_address(ndev);
        }
 

diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index ff76e401a014bbdd32a497fc5b7ecff1168802a9..ab926722557369fa4d7002d408f32e163cbc756a 100644 (file)
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -186,7 +186,7 @@ static void ftgmac100_initial_mac(struct ftgmac100 *priv)
 
        addr = device_get_mac_address(priv->dev, mac, ETH_ALEN);
        if (addr) {
-               ether_addr_copy(priv->netdev->dev_addr, mac);
+               eth_hw_addr_set(priv->netdev, mac);
                dev_info(priv->dev, "Read MAC address %pM from device tree\n",
                         mac);
                return;
@@ -203,7 +203,7 @@ static void ftgmac100_initial_mac(struct ftgmac100 *priv)
        mac[5] = l & 0xff;
 
        if (is_valid_ether_addr(mac)) {
-               ether_addr_copy(priv->netdev->dev_addr, mac);
+               eth_hw_addr_set(priv->netdev, mac);
                dev_info(priv->dev, "Read MAC address %pM from chip\n", mac);
        } else {
                eth_hw_addr_random(priv->netdev);

diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/ethernet/google/gve/gve_adminq.c
index f089d33dd48e06c8378f7a5675f0b240ce6e0a63..af2c1d1535f5d23c1fb817a867415f1663f412f9 100644 (file)
--- a/drivers/net/ethernet/google/gve/gve_adminq.c
+++ b/drivers/net/ethernet/google/gve/gve_adminq.c
@@ -733,7 +733,7 @@ int gve_adminq_describe_device(struct gve_priv *priv)
        }
        priv->dev->max_mtu = mtu;
        priv->num_event_counters = be16_to_cpu(descriptor->counters);
-       ether_addr_copy(priv->dev->dev_addr, descriptor->mac);
+       eth_hw_addr_set(priv->dev, descriptor->mac);
        mac = descriptor->mac;
        dev_info(&priv->pdev->dev, "MAC addr: %pM\n", mac);
        priv->tx_pages_per_qpl = be16_to_cpu(descriptor->tx_pages_per_qpl);

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 468b8f07bf47c57463b6f4d3174df5a2e84484cb..fea1be4c02ed3193e4b1947322bf2281d4f6a251 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -2287,7 +2287,7 @@ static int hns3_nic_net_set_mac_address(struct net_device *netdev, void *p)
                return ret;
        }
 
-       ether_addr_copy(netdev->dev_addr, mac_addr->sa_data);
+       eth_hw_addr_set(netdev, mac_addr->sa_data);
 
        return 0;
 }
@@ -4933,7 +4933,7 @@ static int hns3_init_mac_addr(struct net_device *netdev)
                dev_warn(priv->dev, "using random MAC address %pM\n",
                         netdev->dev_addr);
        } else if (!ether_addr_equal(netdev->dev_addr, mac_addr_temp)) {
-               ether_addr_copy(netdev->dev_addr, mac_addr_temp);
+               eth_hw_addr_set(netdev, mac_addr_temp);
                ether_addr_copy(netdev->perm_addr, mac_addr_temp);
        } else {
                return 0;

diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index 42d374cef66438913cd959c94e5776666d90f752..836617fb3f402bd17ffc13ba94f5abf871ed388a 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -1613,7 +1613,7 @@ static int ibmveth_set_mac_addr(struct net_device *dev, void *p)
                return rc;
        }
 
-       ether_addr_copy(dev->dev_addr, addr->sa_data);
+       eth_hw_addr_set(dev, addr->sa_data);
 
        return 0;
 }

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 21efd76dd4274f18385b552d9d6ddd7706e8145e..9d61167ba76703b0e44f0547c30fb369b31251bf 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -4766,8 +4766,7 @@ static int handle_change_mac_rsp(union ibmvnic_crq *crq,
        /* crq->change_mac_addr.mac_addr is the requested one
         * crq->change_mac_addr_rsp.mac_addr is the returned valid one.
         */
-       ether_addr_copy(netdev->dev_addr,
-                       &crq->change_mac_addr_rsp.mac_addr[0]);
+       eth_hw_addr_set(netdev, &crq->change_mac_addr_rsp.mac_addr[0]);
        ether_addr_copy(adapter->mac_addr,
                        &crq->change_mac_addr_rsp.mac_addr[0]);
 out:
@@ -5723,7 +5722,7 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)
        bitmap_set(adapter->map_ids, 0, 1);
 
        ether_addr_copy(adapter->mac_addr, mac_addr_p);
-       ether_addr_copy(netdev->dev_addr, adapter->mac_addr);
+       eth_hw_addr_set(netdev, adapter->mac_addr);
        netdev->irq = dev->irq;
        netdev->netdev_ops = &ibmvnic_netdev_ops;
        netdev->ethtool_ops = &ibmvnic_ethtool_ops;

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
index 2fb52bd6fc0e156c35b09823a0bb37041133e4b5..2cca9e84e31e1b1d322cfada0d30ec1e355038bd 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
@@ -990,7 +990,7 @@ static int fm10k_set_mac(struct net_device *dev, void *p)
        }
 
        if (!err) {
-               ether_addr_copy(dev->dev_addr, addr->sa_data);
+               eth_hw_addr_set(dev, addr->sa_data);
                ether_addr_copy(hw->mac.addr, addr->sa_data);
                dev->addr_assign_type &= ~NET_ADDR_RANDOM;
        }

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index adfa2768f024dcee43d6a55a29142ef3a4c9a168..b473cb7d7c575142b60e80697ba7759631eecb8d 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -300,7 +300,7 @@ static int fm10k_handle_reset(struct fm10k_intfc *interface)
                if (is_valid_ether_addr(hw->mac.perm_addr)) {
                        ether_addr_copy(hw->mac.addr, hw->mac.perm_addr);
                        ether_addr_copy(netdev->perm_addr, hw->mac.perm_addr);
-                       ether_addr_copy(netdev->dev_addr, hw->mac.perm_addr);
+                       eth_hw_addr_set(netdev, hw->mac.perm_addr);
                        netdev->addr_assign_type &= ~NET_ADDR_RANDOM;
                }
 
@@ -2045,7 +2045,7 @@ static int fm10k_sw_init(struct fm10k_intfc *interface,
                netdev->addr_assign_type |= NET_ADDR_RANDOM;
        }
 
-       ether_addr_copy(netdev->dev_addr, hw->mac.addr);
+       eth_hw_addr_set(netdev, hw->mac.addr);
        ether_addr_copy(netdev->perm_addr, hw->mac.addr);
 
        if (!is_valid_ether_addr(netdev->perm_addr)) {

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 2f20980dd9a58aa8e4251c7b1cf6b69853e83175..f3a1d72538fbffe1729fd532568e1503eccd890c 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -1587,7 +1587,7 @@ static int i40e_set_mac(struct net_device *netdev, void *p)
         */
        spin_lock_bh(&vsi->mac_filter_hash_lock);
        i40e_del_mac_filter(vsi, netdev->dev_addr);
-       ether_addr_copy(netdev->dev_addr, addr->sa_data);
+       eth_hw_addr_set(netdev, addr->sa_data);
        i40e_add_mac_filter(vsi, netdev->dev_addr);
        spin_unlock_bh(&vsi->mac_filter_hash_lock);
 
@@ -13424,7 +13424,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)
        i40e_add_mac_filter(vsi, broadcast);
        spin_unlock_bh(&vsi->mac_filter_hash_lock);
 
-       ether_addr_copy(netdev->dev_addr, mac_addr);
+       eth_hw_addr_set(netdev, mac_addr);
        ether_addr_copy(netdev->perm_addr, mac_addr);
 
        /* i40iw_net_event() reads 16 bytes from neigh->primary_key */

diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c
index 23762a7ef740b261a950e2e454a5a6c0d82d682a..7f812abe5abef6e7459d62ce0e623d5653ab69a9 100644 (file)
--- a/drivers/net/ethernet/intel/iavf/iavf_main.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@ -1847,7 +1847,7 @@ static int iavf_init_get_resources(struct iavf_adapter *adapter)
                eth_hw_addr_random(netdev);
                ether_addr_copy(adapter->hw.mac.addr, netdev->dev_addr);
        } else {
-               ether_addr_copy(netdev->dev_addr, adapter->hw.mac.addr);
+               eth_hw_addr_set(netdev, adapter->hw.mac.addr);
                ether_addr_copy(netdev->perm_addr, adapter->hw.mac.addr);
        }
 

diff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
index 3c735968e1b8527037a315a4bb74c3b6b930189d..8eb8d4663a8169c48c86126bd9cf9a104aea5976 100644 (file)
--- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
@@ -1685,7 +1685,7 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,
                if (!v_retval)
                        iavf_mac_add_ok(adapter);
                if (!ether_addr_equal(netdev->dev_addr, adapter->hw.mac.addr))
-                       ether_addr_copy(netdev->dev_addr, adapter->hw.mac.addr);
+                       eth_hw_addr_set(netdev, adapter->hw.mac.addr);
                break;
        case VIRTCHNL_OP_GET_STATS: {
                struct iavf_eth_stats *stats =
@@ -1716,7 +1716,7 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,
                        ether_addr_copy(adapter->hw.mac.addr, netdev->dev_addr);
                } else {
                        /* refresh current mac address if changed */
-                       ether_addr_copy(netdev->dev_addr, adapter->hw.mac.addr);
+                       eth_hw_addr_set(netdev, adapter->hw.mac.addr);
                        ether_addr_copy(netdev->perm_addr,
                                        adapter->hw.mac.addr);
                }

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 909e5cd9805480267a5c1fb9153568637d8bc4ae..57e24aeffbc56b77b765d85d4a889b74573319da 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -3143,7 +3143,7 @@ static int ice_cfg_netdev(struct ice_vsi *vsi)
        if (vsi->type == ICE_VSI_PF) {
                SET_NETDEV_DEV(netdev, ice_pf_to_dev(vsi->back));
                ether_addr_copy(mac_addr, vsi->port_info->mac.perm_addr);
-               ether_addr_copy(netdev->dev_addr, mac_addr);
+               eth_hw_addr_set(netdev, mac_addr);
                ether_addr_copy(netdev->perm_addr, mac_addr);
        }
 
@@ -5172,7 +5172,7 @@ err_update_filters:
                netdev_err(netdev, "can't set MAC %pM. filter update failed\n",
                           mac);
                netif_addr_lock_bh(netdev);
-               ether_addr_copy(netdev->dev_addr, old_mac);
+               eth_hw_addr_set(netdev, old_mac);
                netif_addr_unlock_bh(netdev);
                return err;
        }

diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index c714e1ecd308959d813d029651b09633c39b9e29..d81811ab4ec48217f39bbce27ee15774ec0ab04f 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -2540,7 +2540,7 @@ void ixgbevf_reset(struct ixgbevf_adapter *adapter)
        }
 
        if (is_valid_ether_addr(adapter->hw.mac.addr)) {
-               ether_addr_copy(netdev->dev_addr, adapter->hw.mac.addr);
+               eth_hw_addr_set(netdev, adapter->hw.mac.addr);
                ether_addr_copy(netdev->perm_addr, adapter->hw.mac.addr);
        }
 
@@ -3054,7 +3054,7 @@ static int ixgbevf_sw_init(struct ixgbevf_adapter *adapter)
                else if (is_zero_ether_addr(adapter->hw.mac.addr))
                        dev_info(&pdev->dev,
                                 "MAC address not assigned by administrator.\n");
-               ether_addr_copy(netdev->dev_addr, hw->mac.addr);
+               eth_hw_addr_set(netdev, hw->mac.addr);
        }
 
        if (!is_valid_ether_addr(netdev->dev_addr)) {
@@ -4231,7 +4231,7 @@ static int ixgbevf_set_mac(struct net_device *netdev, void *p)
 
        ether_addr_copy(hw->mac.addr, addr->sa_data);
        ether_addr_copy(hw->mac.perm_addr, addr->sa_data);
-       ether_addr_copy(netdev->dev_addr, addr->sa_data);
+       eth_hw_addr_set(netdev, addr->sa_data);
 
        return 0;
 }

diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c
index 3e9f324f1061fc87c7ad4a5265ae92ea86692437..097516af4325650f43907b0ef469bfdad5543dbb 100644 (file)
--- a/drivers/net/ethernet/korina.c
+++ b/drivers/net/ethernet/korina.c
@@ -1297,7 +1297,7 @@ static int korina_probe(struct platform_device *pdev)
        lp = netdev_priv(dev);
 
        if (mac_addr)
-               ether_addr_copy(dev->dev_addr, mac_addr);
+               eth_hw_addr_set(dev, mac_addr);
        else if (of_get_mac_address(pdev->dev.of_node, dev->dev_addr) < 0)
                eth_hw_addr_random(dev);
 

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index d5c92e43f89e6ab5b694884abb2336f9c4af9d75..94ea6dd91b748347c93bb45074652ac783fdd96e 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -6083,7 +6083,7 @@ static void mvpp2_port_copy_mac_addr(struct net_device *dev, struct mvpp2 *priv,
 
        if (fwnode_get_mac_address(fwnode, fw_mac_addr, ETH_ALEN)) {
                *mac_from = "firmware node";
-               ether_addr_copy(dev->dev_addr, fw_mac_addr);
+               eth_hw_addr_set(dev, fw_mac_addr);
                return;
        }
 
@@ -6091,7 +6091,7 @@ static void mvpp2_port_copy_mac_addr(struct net_device *dev, struct mvpp2 *priv,
                mvpp21_get_mac_address(port, hw_mac_addr);
                if (is_valid_ether_addr(hw_mac_addr)) {
                        *mac_from = "hardware";
-                       ether_addr_copy(dev->dev_addr, hw_mac_addr);
+                       eth_hw_addr_set(dev, hw_mac_addr);
                        return;
                }
        }

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
index 93575800ca92adc23bae6ae5f6d13496ec1b61a0..75ba57bd1d46d85f163c3568f45b0f3708474d7f 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
@@ -2347,7 +2347,7 @@ int mvpp2_prs_update_mac_da(struct net_device *dev, const u8 *da)
                return err;
 
        /* Set addr in the device */
-       ether_addr_copy(dev->dev_addr, da);
+       eth_hw_addr_set(dev, da);
 
        return 0;
 }

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
index 0aa88cea1676ac7d4e2fc1d5f104345d50694971..9826a9012737568d0a6f7a676dfa685ed7f50be4 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
@@ -188,7 +188,7 @@ static int otx2_hw_get_mac_addr(struct otx2_nic *pfvf,
                return PTR_ERR(msghdr);
        }
        rsp = (struct nix_get_mac_addr_rsp *)msghdr;
-       ether_addr_copy(netdev->dev_addr, rsp->mac_addr);
+       eth_hw_addr_set(netdev, rsp->mac_addr);
        mutex_unlock(&pfvf->mbox.lock);
 
        return 0;

diff --git a/drivers/net/ethernet/marvell/prestera/prestera_main.c b/drivers/net/ethernet/marvell/prestera/prestera_main.c
index 78a7a00bce222129ac3dcf069ed84130ff29805b..b667f560b9318757d2958daf28302975aa9343b9 100644 (file)
--- a/drivers/net/ethernet/marvell/prestera/prestera_main.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_main.c
@@ -137,7 +137,7 @@ static int prestera_port_set_mac_address(struct net_device *dev, void *p)
        if (err)
                return err;
 
-       ether_addr_copy(dev->dev_addr, addr->sa_data);
+       eth_hw_addr_set(dev, addr->sa_data);
 
        return 0;
 }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 40fc7eb8b2b9685d2210ca86fd62fc386aea63a9..005eb3c92506a7a187d9e0118837b44625949923 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -3228,7 +3228,7 @@ static int mlx5e_set_mac(struct net_device *netdev, void *addr)
                return -EADDRNOTAVAIL;
 
        netif_addr_lock_bh(netdev);
-       ether_addr_copy(netdev->dev_addr, saddr->sa_data);
+       eth_hw_addr_set(netdev, saddr->sa_data);
        netif_addr_unlock_bh(netdev);
 
        mlx5e_nic_set_rx_mode(priv);

diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
index 6704f5c1aa32e78cb1b73ee8ab0093091bd19f78..b990782c1eb1f6aed37329660bd0863ee70aae54 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
+++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
@@ -75,7 +75,7 @@ static void mlxbf_gige_initial_mac(struct mlxbf_gige *priv)
        u64_to_ether_addr(local_mac, mac);
 
        if (is_valid_ether_addr(mac)) {
-               ether_addr_copy(priv->netdev->dev_addr, mac);
+               eth_hw_addr_set(priv->netdev, mac);
        } else {
                /* Provide a random MAC if for some reason the device has
                 * not been configured with a valid MAC address already.

diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c
index 09cdc2f2e7ffba4368825d5efe0577c5f857dae3..bf77e8adffbf3aa16eca0739121449ed7d19d726 100644 (file)
--- a/drivers/net/ethernet/microchip/enc28j60.c
+++ b/drivers/net/ethernet/microchip/enc28j60.c
@@ -517,7 +517,7 @@ static int enc28j60_set_mac_address(struct net_device *dev, void *addr)
        if (!is_valid_ether_addr(address->sa_data))
                return -EADDRNOTAVAIL;
 
-       ether_addr_copy(dev->dev_addr, address->sa_data);
+       eth_hw_addr_set(dev, address->sa_data);
        return enc28j60_set_hw_macaddr(dev);
 }
 
@@ -1573,7 +1573,7 @@ static int enc28j60_probe(struct spi_device *spi)
        }
 
        if (device_get_mac_address(&spi->dev, macaddr, sizeof(macaddr)))
-               ether_addr_copy(dev->dev_addr, macaddr);
+               eth_hw_addr_set(dev, macaddr);
        else
                eth_hw_addr_random(dev);
        enc28j60_set_hw_macaddr(dev);

diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c
index 9e8561cdc32a409ae959f5ee93b0e2b7ec7e739a..03d02403c19e208e228a6f5c7cdc1c7d239fc111 100644 (file)
--- a/drivers/net/ethernet/microchip/lan743x_main.c
+++ b/drivers/net/ethernet/microchip/lan743x_main.c
@@ -816,7 +816,7 @@ static int lan743x_mac_init(struct lan743x_adapter *adapter)
                        eth_random_addr(adapter->mac_address);
        }
        lan743x_mac_set_address(adapter, adapter->mac_address);
-       ether_addr_copy(netdev->dev_addr, adapter->mac_address);
+       eth_hw_addr_set(netdev, adapter->mac_address);
 
        return 0;
 }
@@ -2645,7 +2645,7 @@ static int lan743x_netdev_set_mac_address(struct net_device *netdev,
        ret = eth_prepare_mac_addr_change(netdev, sock_addr);
        if (ret)
                return ret;
-       ether_addr_copy(netdev->dev_addr, sock_addr->sa_data);
+       eth_hw_addr_set(netdev, sock_addr->sa_data);
        lan743x_mac_set_address(adapter, sock_addr->sa_data);
        lan743x_rfe_update_mac_address(adapter);
        return 0;

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c b/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c
index cb68eaaac88118ad4402ae2195f210dc30d17242..b21ebaa32d7ef1f27c3626c234b45c6d1ec9beff 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c
@@ -162,7 +162,7 @@ static int sparx5_set_mac_address(struct net_device *dev, void *p)
        sparx5_mact_learn(sparx5, PGID_CPU, addr->sa_data, port->pvid);
 
        /* Record the address */
-       ether_addr_copy(dev->dev_addr, addr->sa_data);
+       eth_hw_addr_set(dev, addr->sa_data);
 
        return 0;
 }

diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index 1b21030308e57c6004c299eb6e76de5a822fd8d6..9a871192ca968b487c8abd75cde79cbc2a79aafa 100644 (file)
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -1608,7 +1608,7 @@ static int mana_init_port(struct net_device *ndev)
        if (apc->num_queues > apc->max_queues)
                apc->num_queues = apc->max_queues;
 
-       ether_addr_copy(ndev->dev_addr, apc->mac_addr);
+       eth_hw_addr_set(ndev, apc->mac_addr);
 
        return 0;
 

diff --git a/drivers/net/ethernet/mscc/ocelot_net.c b/drivers/net/ethernet/mscc/ocelot_net.c
index 8ef3868d7d6882369ef8ebae33988be508c26126..2f23127154392a1c1b8257687394a402b585c1dc 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot_net.c
+++ b/drivers/net/ethernet/mscc/ocelot_net.c
@@ -605,7 +605,7 @@ static int ocelot_port_set_mac_address(struct net_device *dev, void *p)
        /* Then forget the previous one. */
        ocelot_mact_forget(ocelot, dev->dev_addr, ocelot_port->pvid_vlan.vid);
 
-       ether_addr_copy(dev->dev_addr, addr->sa_data);
+       eth_hw_addr_set(dev, addr->sa_data);
        return 0;
 }
 

diff --git a/drivers/net/ethernet/netronome/nfp/abm/main.c b/drivers/net/ethernet/netronome/nfp/abm/main.c
index 605a1617b195edac6df05ae483e084302123538f..5d3df28c648ffc2d1925fa84af04899af9742677 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/abm/main.c
+++ b/drivers/net/ethernet/netronome/nfp/abm/main.c
@@ -305,7 +305,7 @@ nfp_abm_vnic_set_mac(struct nfp_pf *pf, struct nfp_abm *abm, struct nfp_net *nn,
                return;
        }
 
-       ether_addr_copy(nn->dp.netdev->dev_addr, mac_addr);
+       eth_hw_addr_set(nn->dp.netdev, mac_addr);
        ether_addr_copy(nn->dp.netdev->perm_addr, mac_addr);
 }
 

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
index 5fbb7c613ff16a2a4dce682c21fd550e64d9992a..751f76cd4f798837443e001c7b07ceaf9835ce7f 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
@@ -55,7 +55,7 @@ nfp_net_get_mac_addr(struct nfp_pf *pf, struct net_device *netdev,
                return;
        }
 
-       ether_addr_copy(netdev->dev_addr, eth_port->mac_addr);
+       eth_hw_addr_set(netdev, eth_port->mac_addr);
        ether_addr_copy(netdev->perm_addr, eth_port->mac_addr);
 }
 

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
index c0e2f4394aef843fb41d8697f08ac03b4d840c4e..87f2268b16d6e4f81513f234d269c3134b6c7344 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
@@ -58,7 +58,7 @@ static void nfp_netvf_get_mac_addr(struct nfp_net *nn)
                return;
        }
 
-       ether_addr_copy(nn->dp.netdev->dev_addr, mac_addr);
+       eth_hw_addr_set(nn->dp.netdev, mac_addr);
        ether_addr_copy(nn->dp.netdev->perm_addr, mac_addr);
 }
 

diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c
index 346145d3180eb24daca77b036a6dc2d8eea64f4b..cfeb7620ae20b645e433f6f63665bf90de0e55c0 100644 (file)
--- a/drivers/net/ethernet/ni/nixge.c
+++ b/drivers/net/ethernet/ni/nixge.c
@@ -1283,7 +1283,7 @@ static int nixge_probe(struct platform_device *pdev)
 
        mac_addr = nixge_get_nvmem_address(&pdev->dev);
        if (mac_addr && is_valid_ether_addr(mac_addr)) {
-               ether_addr_copy(ndev->dev_addr, mac_addr);
+               eth_hw_addr_set(ndev, mac_addr);
                kfree(mac_addr);
        } else {
                eth_hw_addr_random(ndev);

diff --git a/drivers/net/ethernet/qlogic/qede/qede_filter.c b/drivers/net/ethernet/qlogic/qede/qede_filter.c
index f99b085b56a54c4ce197338b61926570728f73f2..03c51dd37e1f3e836be9726a9669e72a8a40f466 100644 (file)
--- a/drivers/net/ethernet/qlogic/qede/qede_filter.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_filter.c
@@ -557,7 +557,7 @@ void qede_force_mac(void *dev, u8 *mac, bool forced)
                return;
        }
 
-       ether_addr_copy(edev->ndev->dev_addr, mac);
+       eth_hw_addr_set(edev->ndev, mac);
        __qede_unlock(edev);
 }
 
@@ -1101,7 +1101,7 @@ int qede_set_mac_addr(struct net_device *ndev, void *p)
                        goto out;
        }
 
-       ether_addr_copy(ndev->dev_addr, addr->sa_data);
+       eth_hw_addr_set(ndev, addr->sa_data);
        DP_INFO(edev, "Setting device MAC to %pM\n", addr->sa_data);
 
        if (edev->state != QEDE_STATE_OPEN) {

diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c
index ee4c3bd28a934cfb667338f118dab9246b4b886e..75adb71adf181be2526cbb6618ec6e7147b90dfe 100644 (file)
--- a/drivers/net/ethernet/qlogic/qede/qede_main.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_main.c
@@ -836,7 +836,7 @@ static void qede_init_ndev(struct qede_dev *edev)
        ndev->max_mtu = QEDE_MAX_JUMBO_PACKET_SIZE;
 
        /* Set network device HW mac */
-       ether_addr_copy(edev->ndev->dev_addr, edev->dev_info.common.hw_mac);
+       eth_hw_addr_set(edev->ndev, edev->dev_info.common.hw_mac);
 
        ndev->mtu = edev->dev_info.common.mtu;
 }

diff --git a/drivers/net/ethernet/qualcomm/emac/emac.c b/drivers/net/ethernet/qualcomm/emac/emac.c
index 9015a38eaced810c6045ba0b9e042b10c25f972e..fbfabfc5cc510afd0e5e73cc1fc01555c2f4c62a 100644 (file)
--- a/drivers/net/ethernet/qualcomm/emac/emac.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac.c
@@ -550,7 +550,7 @@ static int emac_probe_resources(struct platform_device *pdev,
 
        /* get mac address */
        if (device_get_mac_address(&pdev->dev, maddr, ETH_ALEN))
-               ether_addr_copy(netdev->dev_addr, maddr);
+               eth_hw_addr_set(netdev, maddr);
        else
                eth_hw_addr_random(netdev);
 

diff --git a/drivers/net/ethernet/sfc/ef10_sriov.c b/drivers/net/ethernet/sfc/ef10_sriov.c
index 752d6406f07ed0648780e3efb21a01ce346be570..06d23c708a5fa8bea3a1bc914621519f9986832e 100644 (file)
--- a/drivers/net/ethernet/sfc/ef10_sriov.c
+++ b/drivers/net/ethernet/sfc/ef10_sriov.c
@@ -523,7 +523,7 @@ int efx_ef10_sriov_set_vf_mac(struct efx_nic *efx, int vf_i, u8 *mac)
                        goto fail;
 
                if (vf->efx)
-                       ether_addr_copy(vf->efx->net_dev->dev_addr, mac);
+                       eth_hw_addr_set(vf->efx->net_dev, mac);
        }
 
        ether_addr_copy(vf->mac, mac);

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 43ef4f52902817754e2b146c8ffa142d70a63061..6960a2fe2b53d8be996c1b25da06126540b7bd31 100644 (file)
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -136,7 +136,7 @@ static int efx_probe_port(struct efx_nic *efx)
                return rc;
 
        /* Initialise MAC address to permanent address */
-       ether_addr_copy(efx->net_dev->dev_addr, efx->net_dev->perm_addr);
+       eth_hw_addr_set(efx->net_dev, efx->net_dev->perm_addr);
 
        return 0;
 }

diff --git a/drivers/net/ethernet/sfc/efx_common.c b/drivers/net/ethernet/sfc/efx_common.c
index 896b5925319722b98e46ebe58a1c1e598b90027d..f187631b2c5cac79b538a93fabee761d716921fe 100644 (file)
--- a/drivers/net/ethernet/sfc/efx_common.c
+++ b/drivers/net/ethernet/sfc/efx_common.c
@@ -181,11 +181,11 @@ int efx_set_mac_address(struct net_device *net_dev, void *data)
 
        /* save old address */
        ether_addr_copy(old_addr, net_dev->dev_addr);
-       ether_addr_copy(net_dev->dev_addr, new_addr);
+       eth_hw_addr_set(net_dev, new_addr);
        if (efx->type->set_mac_address) {
                rc = efx->type->set_mac_address(efx);
                if (rc) {
-                       ether_addr_copy(net_dev->dev_addr, old_addr);
+                       eth_hw_addr_set(net_dev, old_addr);
                        return rc;
                }
        }

diff --git a/drivers/net/ethernet/sfc/falcon/efx.c b/drivers/net/ethernet/sfc/falcon/efx.c
index 423bdf81200fd7861ffc540637a63454d8265411..c68837a951f47eb1f73fb01207246201edcb1805 100644 (file)
--- a/drivers/net/ethernet/sfc/falcon/efx.c
+++ b/drivers/net/ethernet/sfc/falcon/efx.c
@@ -1044,7 +1044,7 @@ static int ef4_probe_port(struct ef4_nic *efx)
                return rc;
 
        /* Initialise MAC address to permanent address */
-       ether_addr_copy(efx->net_dev->dev_addr, efx->net_dev->perm_addr);
+       eth_hw_addr_set(efx->net_dev, efx->net_dev->perm_addr);
 
        return 0;
 }
@@ -2162,11 +2162,11 @@ static int ef4_set_mac_address(struct net_device *net_dev, void *data)
 
        /* save old address */
        ether_addr_copy(old_addr, net_dev->dev_addr);
-       ether_addr_copy(net_dev->dev_addr, new_addr);
+       eth_hw_addr_set(net_dev, new_addr);
        if (efx->type->set_mac_address) {
                rc = efx->type->set_mac_address(efx);
                if (rc) {
-                       ether_addr_copy(net_dev->dev_addr, old_addr);
+                       eth_hw_addr_set(net_dev, old_addr);
                        return rc;
                }
        }

diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c
index f80a2aef99722e69642387ac567ffc9b28416e8f..c7e56dc0a4949617b55335a2d3f5417891982183 100644 (file)
--- a/drivers/net/ethernet/socionext/netsec.c
+++ b/drivers/net/ethernet/socionext/netsec.c
@@ -2036,7 +2036,7 @@ static int netsec_probe(struct platform_device *pdev)
 
        mac = device_get_mac_address(&pdev->dev, macbuf, sizeof(macbuf));
        if (mac)
-               ether_addr_copy(ndev->dev_addr, mac);
+               eth_hw_addr_set(ndev, mac);
 
        if (priv->eeprom_base &&
            (!mac || !is_valid_ether_addr(ndev->dev_addr))) {

diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index 0de5f4a4fe089324d8c353eab638b603a784fca6..6904bfaa577725949517ca2f87aadbae84b2572f 100644 (file)
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -1970,7 +1970,7 @@ am65_cpsw_nuss_init_port_ndev(struct am65_cpsw_common *common, u32 port_idx)
        ndev_priv->msg_enable = AM65_CPSW_DEBUG;
        SET_NETDEV_DEV(port->ndev, dev);
 
-       ether_addr_copy(port->ndev->dev_addr, port->slave.mac_addr);
+       eth_hw_addr_set(port->ndev, port->slave.mac_addr);
 
        port->ndev->min_mtu = AM65_CPSW_MIN_PACKET_SIZE;
        port->ndev->max_mtu = AM65_CPSW_MAX_PACKET_SIZE;

diff --git a/drivers/net/ethernet/ti/cpsw_new.c b/drivers/net/ethernet/ti/cpsw_new.c
index 1530532748a86a1fe1ca0d063f490be4c6784741..279e261e47207420fe82a9ad2b7f514a6fc7ae4a 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw_new.c
+++ b/drivers/net/ethernet/ti/cpsw_new.c
@@ -1000,7 +1000,7 @@ static int cpsw_ndo_set_mac_address(struct net_device *ndev, void *p)
                           flags, vid);
 
        ether_addr_copy(priv->mac_addr, addr->sa_data);
-       ether_addr_copy(ndev->dev_addr, priv->mac_addr);
+       eth_hw_addr_set(ndev, priv->mac_addr);
        cpsw_set_slave_mac(&cpsw->slaves[slave_no], priv);
 
        pm_runtime_put(cpsw->dev);
@@ -1401,7 +1401,7 @@ static int cpsw_create_ports(struct cpsw_common *cpsw)
                        dev_info(cpsw->dev, "Random MACID = %pM\n",
                                 priv->mac_addr);
                }
-               ether_addr_copy(ndev->dev_addr, slave_data->mac_addr);
+               eth_hw_addr_set(ndev, slave_data->mac_addr);
                ether_addr_copy(priv->mac_addr, slave_data->mac_addr);
 
                cpsw->slaves[i].ndev = ndev;

diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index e8291d8488391e2b4a6a382ab7c5a20f2f1df4ae..e4b4624be2ae9bd796f07349fb972ac725713507 100644 (file)
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -1899,7 +1899,7 @@ static int davinci_emac_probe(struct platform_device *pdev)
 
        rc = davinci_emac_try_get_mac(pdev, res_ctrl ? 0 : 1, priv->mac_addr);
        if (!rc)
-               ether_addr_copy(ndev->dev_addr, priv->mac_addr);
+               eth_hw_addr_set(ndev, priv->mac_addr);
 
        if (!is_valid_ether_addr(priv->mac_addr)) {
                /* Use random MAC if still none obtained. */

diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
index eda2961c0fe2a8054fdab620044702f9d82ed135..a4cd44a39e3d4398729089ca78fa728a105a3d45 100644 (file)
--- a/drivers/net/ethernet/ti/netcp_core.c
+++ b/drivers/net/ethernet/ti/netcp_core.c
@@ -2028,7 +2028,7 @@ static int netcp_create_interface(struct netcp_device *netcp_device,
 
                emac_arch_get_mac_addr(efuse_mac_addr, efuse, efuse_mac);
                if (is_valid_ether_addr(efuse_mac_addr))
-                       ether_addr_copy(ndev->dev_addr, efuse_mac_addr);
+                       eth_hw_addr_set(ndev, efuse_mac_addr);
                else
                        eth_random_addr(ndev->dev_addr);
 

diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 928c411bd50963278407ad317b22db4eaaed0895..e7b2e5fd8d24dbbc6043706d7178de47fd08669e 100644 (file)
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -323,7 +323,7 @@ static inline void eth_hw_addr_inherit(struct net_device *dst,
                                       struct net_device *src)
 {
        dst->addr_assign_type = src->addr_assign_type;
-       ether_addr_copy(dst->dev_addr, src->dev_addr);
+       eth_hw_addr_set(dst, src->dev_addr);
 }
 
 /**