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

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: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e35b8d7d

drivers/net/ethernet/agere/et131x.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/alacritech/slicoss.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/ethernet/amazon/ena/ena_netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/net/ethernet/aquantia/atlantic/aq_nic.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/ethernet/broadcom/bgmac-bcma.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */