Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c1f0a1f authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

net: drivers/net: Convert random_ether_addr to eth_random_addr 



random_ether_addr is a #define for eth_random_addr which is
generally preferred in kernel code by ~3:1

Convert the uses of random_ether_addr to enable removing the #define

Miscellanea:

o Convert &vfmac[0] to equivalent vfmac and avoid unnecessary line wrap

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d55207e3

drivers/net/ethernet/cavium/liquidio/lio_main.c

+2 −3
Original line number Diff line number Diff line
@@ -3569,9 +3569,8 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) 
		for (j = 0; j < octeon_dev->sriov_info.max_vfs; j++) {

			u8 vfmac[ETH_ALEN];



			random_ether_addr(&vfmac[0]);

			if (__liquidio_set_vf_mac(netdev, j,

						  &vfmac[0], false)) {

			eth_random_addr(vfmac);

			if (__liquidio_set_vf_mac(netdev, j, vfmac, false)) {

				dev_err(&octeon_dev->pci_dev->dev,

					"Error setting VF%d MAC address\n",

					j);

drivers/net/ethernet/cortina/gemini.c

+1 −1
Original line number Diff line number Diff line
@@ -2435,7 +2435,7 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev) 
			port->mac_addr[0], port->mac_addr[1],

			port->mac_addr[2]);

		dev_info(dev, "using a random ethernet address\n");

		random_ether_addr(netdev->dev_addr);

		eth_random_addr(netdev->dev_addr);

	}

	gmac_write_mac_address(netdev);

drivers/net/ethernet/hisilicon/hip04_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ static int hip04_mac_probe(struct platform_device *pdev) 
		hip04_config_port(ndev, SPEED_100, DUPLEX_FULL);



	hip04_config_fifo(priv);

	random_ether_addr(ndev->dev_addr);

	eth_random_addr(ndev->dev_addr);

	hip04_update_mac_address(ndev);



	ret = hip04_alloc_ring(ndev, d);

drivers/net/ethernet/intel/i40e/i40e_main.c

+1 −1
Original line number Diff line number Diff line
@@ -11978,7 +11978,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) 
		snprintf(netdev->name, IFNAMSIZ, "%.*sv%%d",

			 IFNAMSIZ - 4,

			 pf->vsi[pf->lan_vsi]->netdev->name);

		random_ether_addr(mac_addr);

		eth_random_addr(mac_addr);



		spin_lock_bh(&vsi->mac_filter_hash_lock);

		i40e_add_mac_filter(vsi, mac_addr);

drivers/net/ethernet/microchip/lan743x_main.c

+1 −1
Original line number Diff line number Diff line
@@ -828,7 +828,7 @@ static int lan743x_mac_init(struct lan743x_adapter *adapter) 
	}



	if (!mac_address_valid)

		random_ether_addr(adapter->mac_address);

		eth_random_addr(adapter->mac_address);

	lan743x_mac_set_address(adapter, adapter->mac_address);

	ether_addr_copy(netdev->dev_addr, adapter->mac_address);

	return 0;