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

ethernet: use eth_hw_addr_set() 



Convert all Ethernet drivers from memcpy(... ETH_ADDR)
to eth_hw_addr_set():

  @@
  expression dev, np;
  @@
  - memcpy(dev->dev_addr, np, ETH_ALEN)
  + 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 2f23e5ce

drivers/net/ethernet/8390/ax88796.c

+3 −3
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ static int ax_init_dev(struct net_device *dev) 
			for (i = 0; i < 16; i++)

				SA_prom[i] = SA_prom[i+i];



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

		eth_hw_addr_set(dev, SA_prom);

	}



#ifdef CONFIG_AX88796_93CX6
@@ -733,7 +733,7 @@ static int ax_init_dev(struct net_device *dev) 
				       (__le16 __force *)mac_addr,

				       sizeof(mac_addr) >> 1);



		memcpy(dev->dev_addr, mac_addr, ETH_ALEN);

		eth_hw_addr_set(dev, mac_addr);

	}

#endif

	if (ax->plat->wordlength == 2) {
@@ -757,7 +757,7 @@ static int ax_init_dev(struct net_device *dev) 


	if ((ax->plat->flags & AXFLG_MAC_FROMPLATFORM) &&

	    ax->plat->mac_addr)

		memcpy(dev->dev_addr, ax->plat->mac_addr, ETH_ALEN);

		eth_hw_addr_set(dev, ax->plat->mac_addr);



	if (!is_valid_ether_addr(dev->dev_addr)) {

		eth_hw_addr_random(dev);

drivers/net/ethernet/allwinner/sun4i-emac.c

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

		return -EBUSY;



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

	eth_hw_addr_set(dev, addr->sa_data);



	writel(dev->dev_addr[0] << 16 | dev->dev_addr[1] << 8 | dev->

	       dev_addr[2], db->membase + EMAC_MAC_A1_REG);

drivers/net/ethernet/amd/atarilance.c

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ static unsigned long __init lance_probe1( struct net_device *dev, 
	switch( lp->cardtype ) {

	  case OLD_RIEBL:

		/* No ethernet address! (Set some default address) */

		memcpy(dev->dev_addr, OldRieblDefHwaddr, ETH_ALEN);

		eth_hw_addr_set(dev, OldRieblDefHwaddr);

		break;

	  case NEW_RIEBL:

		lp->memcpy_f(dev->dev_addr, RIEBL_HWADDR_ADDR, ETH_ALEN);

drivers/net/ethernet/amd/au1000_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -1178,7 +1178,7 @@ static int au1000_probe(struct platform_device *pdev) 
		aup->phy1_search_mac0 = 1;

	} else {

		if (is_valid_ether_addr(pd->mac)) {

			memcpy(dev->dev_addr, pd->mac, ETH_ALEN);

			eth_hw_addr_set(dev, pd->mac);

		} else {

			/* Set a random MAC since no valid provided by platform_data. */

			eth_hw_addr_random(dev);

drivers/net/ethernet/amd/nmclan_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ static int nmclan_config(struct pcmcia_device *link) 
	  kfree(buf);

	  goto failed;

  }

  memcpy(dev->dev_addr, buf, ETH_ALEN);

  eth_hw_addr_set(dev, buf);

  kfree(buf);



  /* Verify configuration by reading the MACE ID. */