Skip to content

Commit f2cedb6

Browse files
dalgaafdavem330
dalgaaf
authored and
davem330
committed
net: replace random_ether_addr() with eth_hw_addr_random()
Replace usage of random_ether_addr() with eth_hw_addr_random() to set addr_assign_type correctly to NET_ADDR_RANDOM. Change the trivial cases. v2: adapt to renamed eth_hw_addr_random() Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent a1e785e commit f2cedb6

File tree

24 files changed

+26
-27
lines changed

24 files changed

+26
-27
lines changed

‎drivers/net/ethernet/cadence/macb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ static void __init macb_get_hwaddr(struct macb *bp)
8787
memcpy(bp->dev->dev_addr, addr, sizeof(addr));
8888
} else {
8989
netdev_info(bp->dev, "invalid hw address, using random\n");
90-
random_ether_addr(bp->dev->dev_addr);
90+
eth_hw_addr_random(bp->dev);
9191
}
9292
}
9393

‎drivers/net/ethernet/cirrus/ep93xx_eth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,7 @@ static int ep93xx_eth_probe(struct platform_device *pdev)
859859
ep->mdc_divisor = 40; /* Max HCLK 100 MHz, min MDIO clk 2.5 MHz. */
860860

861861
if (is_zero_ether_addr(dev->dev_addr))
862-
random_ether_addr(dev->dev_addr);
862+
eth_hw_addr_random(dev);
863863

864864
err = register_netdev(dev);
865865
if (err) {

‎drivers/net/ethernet/davicom/dm9000.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1585,7 +1585,7 @@ dm9000_probe(struct platform_device *pdev)
15851585
dev_warn(db->dev, "%s: Invalid ethernet MAC address. Please "
15861586
"set using ifconfig\n", ndev->name);
15871587

1588-
random_ether_addr(ndev->dev_addr);
1588+
eth_hw_addr_random(ndev);
15891589
mac_src = "random";
15901590
}
15911591

‎drivers/net/ethernet/dnet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ static int __devinit dnet_probe(struct platform_device *pdev)
895895

896896
if (!is_valid_ether_addr(dev->dev_addr)) {
897897
/* choose a random ethernet address */
898-
random_ether_addr(dev->dev_addr);
898+
eth_hw_addr_random(dev);
899899
__dnet_set_hwaddr(bp);
900900
}
901901

‎drivers/net/ethernet/faraday/ftgmac100.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,7 @@ static int ftgmac100_probe(struct platform_device *pdev)
12891289
netdev_info(netdev, "irq %d, mapped at %p\n", priv->irq, priv->base);
12901290

12911291
if (!is_valid_ether_addr(netdev->dev_addr)) {
1292-
random_ether_addr(netdev->dev_addr);
1292+
eth_hw_addr_random(netdev);
12931293
netdev_info(netdev, "generated random MAC address %pM\n",
12941294
netdev->dev_addr);
12951295
}

‎drivers/net/ethernet/faraday/ftmac100.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1133,7 +1133,7 @@ static int ftmac100_probe(struct platform_device *pdev)
11331133
netdev_info(netdev, "irq %d, mapped at %p\n", priv->irq, priv->base);
11341134

11351135
if (!is_valid_ether_addr(netdev->dev_addr)) {
1136-
random_ether_addr(netdev->dev_addr);
1136+
eth_hw_addr_random(netdev);
11371137
netdev_info(netdev, "generated random MAC address %pM\n",
11381138
netdev->dev_addr);
11391139
}

‎drivers/net/ethernet/mipsnet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ static int __devinit mipsnet_probe(struct platform_device *dev)
281281
* Lacking any better mechanism to allocate a MAC address we use a
282282
* random one ...
283283
*/
284-
random_ether_addr(netdev->dev_addr);
284+
eth_hw_addr_random(netdev);
285285

286286
err = register_netdev(netdev);
287287
if (err) {

‎drivers/net/ethernet/natsemi/macsonic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ static void __devinit mac_onboard_sonic_ethernet_addr(struct net_device *dev)
307307

308308
printk(KERN_WARNING "macsonic: MAC address in CAM entry 15 "
309309
"seems invalid, will use a random MAC\n");
310-
random_ether_addr(dev->dev_addr);
310+
eth_hw_addr_random(dev);
311311
}
312312

313313
static int __devinit mac_onboard_sonic_probe(struct net_device *dev)

‎drivers/net/ethernet/rdc/r6040.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
11511151
if (!(adrp[0] || adrp[1] || adrp[2])) {
11521152
netdev_warn(dev, "MAC address not initialized, "
11531153
"generating random\n");
1154-
random_ether_addr(dev->dev_addr);
1154+
eth_hw_addr_random(dev);
11551155
}
11561156

11571157
/* Link new device into r6040_root_dev */

‎drivers/net/ethernet/sis/sis900.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
527527
ret = sis900_get_mac_addr(pci_dev, net_dev);
528528

529529
if (!ret || !is_valid_ether_addr(net_dev->dev_addr)) {
530-
random_ether_addr(net_dev->dev_addr);
530+
eth_hw_addr_random(net_dev);
531531
printk(KERN_WARNING "%s: Unreadable or invalid MAC address,"
532532
"using random generated one\n", dev_name);
533533
}

‎drivers/net/ethernet/smsc/smsc9420.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -509,10 +509,9 @@ static void smsc9420_check_mac_address(struct net_device *dev)
509509
smsc_dbg(PROBE, "Mac Address is read from EEPROM");
510510
} else {
511511
/* eeprom values are invalid, generate random MAC */
512-
random_ether_addr(dev->dev_addr);
512+
eth_hw_addr_random(dev);
513513
smsc9420_set_mac_address(dev);
514-
smsc_dbg(PROBE,
515-
"MAC Address is set to random_ether_addr");
514+
smsc_dbg(PROBE, "MAC Address is set to random");
516515
}
517516
}
518517
}

‎drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ static void stmmac_check_ether_addr(struct stmmac_priv *priv)
910910
priv->dev->base_addr,
911911
priv->dev->dev_addr, 0);
912912
if (!is_valid_ether_addr(priv->dev->dev_addr))
913-
random_ether_addr(priv->dev->dev_addr);
913+
eth_hw_addr_random(priv->dev);
914914
}
915915
pr_warning("%s: device MAC address %pM\n", priv->dev->name,
916916
priv->dev->dev_addr);

‎drivers/net/ethernet/toshiba/tc35815.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ static int __devinit tc35815_init_one(struct pci_dev *pdev,
849849
/* Retrieve the ethernet address. */
850850
if (tc35815_init_dev_addr(dev)) {
851851
dev_warn(&pdev->dev, "not valid ether addr\n");
852-
random_ether_addr(dev->dev_addr);
852+
eth_hw_addr_random(dev);
853853
}
854854

855855
rc = register_netdev(dev);

‎drivers/net/ethernet/via/via-rhine.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
983983
if (!is_valid_ether_addr(dev->dev_addr)) {
984984
/* Report it and use a random ethernet address instead */
985985
netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr);
986-
random_ether_addr(dev->dev_addr);
986+
eth_hw_addr_random(dev);
987987
netdev_info(dev, "Using random MAC address: %pM\n",
988988
dev->dev_addr);
989989
}

‎drivers/net/ifb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ static void ifb_setup(struct net_device *dev)
184184
dev->flags |= IFF_NOARP;
185185
dev->flags &= ~IFF_MULTICAST;
186186
dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING);
187-
random_ether_addr(dev->dev_addr);
187+
eth_hw_addr_random(dev);
188188
}
189189

190190
static netdev_tx_t ifb_xmit(struct sk_buff *skb, struct net_device *dev)

‎drivers/net/tun.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ static void tun_net_init(struct net_device *dev)
531531
ether_setup(dev);
532532
dev->priv_flags &= ~IFF_TX_SKB_SHARING;
533533

534-
random_ether_addr(dev->dev_addr);
534+
eth_hw_addr_random(dev);
535535

536536
dev->tx_queue_len = TUN_READQ_SIZE; /* We prefer our own queue length */
537537
break;

‎drivers/net/usb/smsc75xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ static void smsc75xx_init_mac_address(struct usbnet *dev)
615615
}
616616

617617
/* no eeprom, or eeprom values are invalid. generate random MAC */
618-
random_ether_addr(dev->net->dev_addr);
618+
eth_hw_addr_random(dev->net);
619619
netif_dbg(dev, ifup, dev->net, "MAC address set to random_ether_addr");
620620
}
621621

‎drivers/net/usb/smsc95xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ static void smsc95xx_init_mac_address(struct usbnet *dev)
614614
}
615615

616616
/* no eeprom, or eeprom values are invalid. generate random MAC */
617-
random_ether_addr(dev->net->dev_addr);
617+
eth_hw_addr_random(dev->net);
618618
netif_dbg(dev, ifup, dev->net, "MAC address set to random_ether_addr\n");
619619
}
620620

‎drivers/net/veth.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
346346
}
347347

348348
if (tbp[IFLA_ADDRESS] == NULL)
349-
random_ether_addr(peer->dev_addr);
349+
eth_hw_addr_random(peer);
350350

351351
err = register_netdevice(peer);
352352
put_net(net);
@@ -368,7 +368,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
368368
*/
369369

370370
if (tb[IFLA_ADDRESS] == NULL)
371-
random_ether_addr(dev->dev_addr);
371+
eth_hw_addr_random(dev);
372372

373373
if (tb[IFLA_IFNAME])
374374
nla_strlcpy(dev->name, tb[IFLA_IFNAME], IFNAMSIZ);

‎drivers/net/virtio_net.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1060,7 +1060,7 @@ static int virtnet_probe(struct virtio_device *vdev)
10601060
if (virtio_config_val_len(vdev, VIRTIO_NET_F_MAC,
10611061
offsetof(struct virtio_net_config, mac),
10621062
dev->dev_addr, dev->addr_len) < 0)
1063-
random_ether_addr(dev->dev_addr);
1063+
eth_hw_addr_random(dev);
10641064

10651065
/* Set up our device-specific information */
10661066
vi = netdev_priv(dev);

‎drivers/net/wan/hdlc_fr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,7 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
10871087
}
10881088

10891089
if (type == ARPHRD_ETHER)
1090-
random_ether_addr(dev->dev_addr);
1090+
eth_hw_addr_random(dev);
10911091
else {
10921092
*(__be16*)dev->dev_addr = htons(dlci);
10931093
dlci_to_q922(dev->broadcast, dlci);

‎drivers/net/wan/hdlc_raw_eth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ static int raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr)
101101
old_qlen = dev->tx_queue_len;
102102
ether_setup(dev);
103103
dev->tx_queue_len = old_qlen;
104-
random_ether_addr(dev->dev_addr);
104+
eth_hw_addr_random(dev);
105105
netif_dormant_off(dev);
106106
return 0;
107107
}

‎net/ipv4/ip_gre.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1536,7 +1536,7 @@ static int ipgre_newlink(struct net *src_net, struct net_device *dev, struct nla
15361536
return -EEXIST;
15371537

15381538
if (dev->type == ARPHRD_ETHER && !tb[IFLA_ADDRESS])
1539-
random_ether_addr(dev->dev_addr);
1539+
eth_hw_addr_random(dev);
15401540

15411541
mtu = ipgre_tunnel_bind_dev(dev);
15421542
if (!tb[IFLA_MTU])

‎net/l2tp/l2tp_eth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ static int l2tp_eth_dev_init(struct net_device *dev)
6464
struct l2tp_eth *priv = netdev_priv(dev);
6565

6666
priv->dev = dev;
67-
random_ether_addr(dev->dev_addr);
67+
eth_hw_addr_random(dev);
6868
memset(&dev->broadcast[0], 0xff, 6);
6969

7070
return 0;

0 commit comments

Comments
 (0)