Skip to content

Commit 6c1f0a1

Browse files
JoePerchesdavem330
authored andcommitted
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: Joe Perches <[email protected]> Acked-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent d55207e commit 6c1f0a1

File tree

14 files changed

+16
-17
lines changed

14 files changed

+16
-17
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3569,9 +3569,8 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
35693569
for (j = 0; j < octeon_dev->sriov_info.max_vfs; j++) {
35703570
u8 vfmac[ETH_ALEN];
35713571

3572-
random_ether_addr(&vfmac[0]);
3573-
if (__liquidio_set_vf_mac(netdev, j,
3574-
&vfmac[0], false)) {
3572+
eth_random_addr(vfmac);
3573+
if (__liquidio_set_vf_mac(netdev, j, vfmac, false)) {
35753574
dev_err(&octeon_dev->pci_dev->dev,
35763575
"Error setting VF%d MAC address\n",
35773576
j);

drivers/net/ethernet/cortina/gemini.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2435,7 +2435,7 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
24352435
port->mac_addr[0], port->mac_addr[1],
24362436
port->mac_addr[2]);
24372437
dev_info(dev, "using a random ethernet address\n");
2438-
random_ether_addr(netdev->dev_addr);
2438+
eth_random_addr(netdev->dev_addr);
24392439
}
24402440
gmac_write_mac_address(netdev);
24412441

drivers/net/ethernet/hisilicon/hip04_eth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ static int hip04_mac_probe(struct platform_device *pdev)
904904
hip04_config_port(ndev, SPEED_100, DUPLEX_FULL);
905905

906906
hip04_config_fifo(priv);
907-
random_ether_addr(ndev->dev_addr);
907+
eth_random_addr(ndev->dev_addr);
908908
hip04_update_mac_address(ndev);
909909

910910
ret = hip04_alloc_ring(ndev, d);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11978,7 +11978,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)
1197811978
snprintf(netdev->name, IFNAMSIZ, "%.*sv%%d",
1197911979
IFNAMSIZ - 4,
1198011980
pf->vsi[pf->lan_vsi]->netdev->name);
11981-
random_ether_addr(mac_addr);
11981+
eth_random_addr(mac_addr);
1198211982

1198311983
spin_lock_bh(&vsi->mac_filter_hash_lock);
1198411984
i40e_add_mac_filter(vsi, mac_addr);

drivers/net/ethernet/microchip/lan743x_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@ static int lan743x_mac_init(struct lan743x_adapter *adapter)
828828
}
829829

830830
if (!mac_address_valid)
831-
random_ether_addr(adapter->mac_address);
831+
eth_random_addr(adapter->mac_address);
832832
lan743x_mac_set_address(adapter, adapter->mac_address);
833833
ether_addr_copy(netdev->dev_addr, adapter->mac_address);
834834
return 0;

drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ int qlcnic_sriov_init(struct qlcnic_adapter *adapter, int num_vfs)
212212
vp->max_tx_bw = MAX_BW;
213213
vp->min_tx_bw = MIN_BW;
214214
vp->spoofchk = false;
215-
random_ether_addr(vp->mac);
215+
eth_random_addr(vp->mac);
216216
dev_info(&adapter->pdev->dev,
217217
"MAC Address %pM is configured for VF %d\n",
218218
vp->mac, i);

drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ void rmnet_vnd_setup(struct net_device *rmnet_dev)
210210
rmnet_dev->netdev_ops = &rmnet_vnd_ops;
211211
rmnet_dev->mtu = RMNET_DFLT_PACKET_SIZE;
212212
rmnet_dev->needed_headroom = RMNET_NEEDED_HEADROOM;
213-
random_ether_addr(rmnet_dev->dev_addr);
213+
eth_random_addr(rmnet_dev->dev_addr);
214214
rmnet_dev->tx_queue_len = RMNET_TX_QUEUE_LEN;
215215

216216
/* Raw IP mode */

drivers/net/ethernet/sfc/ef10_sriov.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ static int efx_ef10_sriov_alloc_vf_vswitching(struct efx_nic *efx)
199199
return -ENOMEM;
200200

201201
for (i = 0; i < efx->vf_count; i++) {
202-
random_ether_addr(nic_data->vf[i].mac);
202+
eth_random_addr(nic_data->vf[i].mac);
203203
nic_data->vf[i].efx = NULL;
204204
nic_data->vf[i].vlan = EFX_EF10_NO_VLAN;
205205

drivers/net/ethernet/ti/cpsw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2927,7 +2927,7 @@ static int cpsw_probe_dual_emac(struct cpsw_priv *priv)
29272927
dev_info(cpsw->dev, "cpsw: Detected MACID = %pM\n",
29282928
priv_sl2->mac_addr);
29292929
} else {
2930-
random_ether_addr(priv_sl2->mac_addr);
2930+
eth_random_addr(priv_sl2->mac_addr);
29312931
dev_info(cpsw->dev, "cpsw: Random MACID = %pM\n",
29322932
priv_sl2->mac_addr);
29332933
}

drivers/net/ethernet/ti/netcp_core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2052,7 +2052,7 @@ static int netcp_create_interface(struct netcp_device *netcp_device,
20522052
if (is_valid_ether_addr(efuse_mac_addr))
20532053
ether_addr_copy(ndev->dev_addr, efuse_mac_addr);
20542054
else
2055-
random_ether_addr(ndev->dev_addr);
2055+
eth_random_addr(ndev->dev_addr);
20562056

20572057
devm_iounmap(dev, efuse);
20582058
devm_release_mem_region(dev, res.start, size);
@@ -2061,7 +2061,7 @@ static int netcp_create_interface(struct netcp_device *netcp_device,
20612061
if (mac_addr)
20622062
ether_addr_copy(ndev->dev_addr, mac_addr);
20632063
else
2064-
random_ether_addr(ndev->dev_addr);
2064+
eth_random_addr(ndev->dev_addr);
20652065
}
20662066

20672067
ret = of_property_read_string(node_interface, "rx-channel",

drivers/net/ntb_netdev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ static int ntb_netdev_probe(struct device *client_dev)
430430
ndev->hw_features = ndev->features;
431431
ndev->watchdog_timeo = msecs_to_jiffies(NTB_TX_TIMEOUT_MS);
432432

433-
random_ether_addr(ndev->perm_addr);
433+
eth_random_addr(ndev->perm_addr);
434434
memcpy(ndev->dev_addr, ndev->perm_addr, ndev->addr_len);
435435

436436
ndev->netdev_ops = &ntb_netdev_ops;

drivers/net/usb/lan78xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1720,7 +1720,7 @@ static void lan78xx_init_mac_address(struct lan78xx_net *dev)
17201720
"MAC address read from EEPROM");
17211721
} else {
17221722
/* generate random MAC */
1723-
random_ether_addr(addr);
1723+
eth_random_addr(addr);
17241724
netif_dbg(dev, ifup, dev->net,
17251725
"MAC address set to random addr");
17261726
}

drivers/net/wireless/ath/ath9k/hw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ static void ath9k_hw_init_macaddr(struct ath_hw *ah)
496496
ath_err(common, "eeprom contains invalid mac address: %pM\n",
497497
common->macaddr);
498498

499-
random_ether_addr(common->macaddr);
499+
eth_random_addr(common->macaddr);
500500
ath_err(common, "random mac address will be used: %pM\n",
501501
common->macaddr);
502502

net/batman-adv/bridge_loop_avoidance.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1449,7 +1449,7 @@ static void batadv_bla_periodic_work(struct work_struct *work)
14491449
* detection frames. Set the locally administered bit to avoid
14501450
* collisions with users mac addresses.
14511451
*/
1452-
random_ether_addr(bat_priv->bla.loopdetect_addr);
1452+
eth_random_addr(bat_priv->bla.loopdetect_addr);
14531453
bat_priv->bla.loopdetect_addr[0] = 0xba;
14541454
bat_priv->bla.loopdetect_addr[1] = 0xbe;
14551455
bat_priv->bla.loopdetect_lasttime = jiffies;

0 commit comments

Comments
 (0)