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

ethernet: use eth_hw_addr_set() for dev->addr_len cases 



Convert all Ethernet drivers from memcpy(... dev->addr_len)
to eth_hw_addr_set():

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

In theory addr_len may not be ETH_ALEN, but we don't expect
non-Ethernet devices to live under this directory, and only
the following cases of setting addr_len exist:
 - cxgb4 for mgmt device,
and the drivers which set it to ETH_ALEN: s2io, mlx4, vxge.

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

drivers/net/ethernet/8390/ne2k-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static int ne2k_pci_init_one(struct pci_dev *pdev, 
	dev->ethtool_ops = &ne2k_pci_ethtool_ops;

	NS8390_init(dev, 0);



	memcpy(dev->dev_addr, SA_prom, dev->addr_len);

	eth_hw_addr_set(dev, SA_prom);



	i = register_netdev(dev);

	if (i)

drivers/net/ethernet/actions/owl-emac.c

+1 −1
Original line number Diff line number Diff line
@@ -1173,7 +1173,7 @@ static int owl_emac_ndo_set_mac_addr(struct net_device *netdev, void *addr) 
	if (netif_running(netdev))

		return -EBUSY;



	memcpy(netdev->dev_addr, skaddr->sa_data, netdev->addr_len);

	eth_hw_addr_set(netdev, skaddr->sa_data);

	owl_emac_set_hw_mac_addr(netdev);



	return owl_emac_setup_frame_xmit(netdev_priv(netdev));

drivers/net/ethernet/aeroflex/greth.c

+1 −1
Original line number Diff line number Diff line
@@ -1025,7 +1025,7 @@ static int greth_set_mac_add(struct net_device *dev, void *p) 
	if (!is_valid_ether_addr(addr->sa_data))

		return -EADDRNOTAVAIL;



	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);

	eth_hw_addr_set(dev, addr->sa_data);

	GRETH_REGSAVE(regs->esa_msb, dev->dev_addr[0] << 8 | dev->dev_addr[1]);

	GRETH_REGSAVE(regs->esa_lsb, dev->dev_addr[2] << 24 | dev->dev_addr[3] << 16 |

		      dev->dev_addr[4] << 8 | dev->dev_addr[5]);

drivers/net/ethernet/alteon/acenic.c

+1 −1
Original line number Diff line number Diff line
@@ -2718,7 +2718,7 @@ static int ace_set_mac_addr(struct net_device *dev, void *p) 
	if(netif_running(dev))

		return -EBUSY;



	memcpy(dev->dev_addr, addr->sa_data,dev->addr_len);

	eth_hw_addr_set(dev, addr->sa_data);



	da = (u8 *)dev->dev_addr;

drivers/net/ethernet/amd/amd8111e.c

+1 −1
Original line number Diff line number Diff line
@@ -1500,7 +1500,7 @@ static int amd8111e_set_mac_address(struct net_device *dev, void *p) 
	int i;

	struct sockaddr *addr = p;



	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);

	eth_hw_addr_set(dev, addr->sa_data);

	spin_lock_irq(&lp->lock);

	/* Setting the MAC address to the device */

	for (i = 0; i < ETH_ALEN; i++)