tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Danny Kukawka and committed by
David S. Miller f2cedb63 a1e785e0

+26 -27
+1 -1
drivers/net/ethernet/cadence/macb.c
··· 87 87 memcpy(bp->dev->dev_addr, addr, sizeof(addr)); 88 88 } else { 89 89 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); 91 91 } 92 92 } 93 93
+1 -1
drivers/net/ethernet/cirrus/ep93xx_eth.c
··· 859 859 ep->mdc_divisor = 40; /* Max HCLK 100 MHz, min MDIO clk 2.5 MHz. */ 860 860 861 861 if (is_zero_ether_addr(dev->dev_addr)) 862 - random_ether_addr(dev->dev_addr); 862 + eth_hw_addr_random(dev); 863 863 864 864 err = register_netdev(dev); 865 865 if (err) {
+1 -1
drivers/net/ethernet/davicom/dm9000.c
··· 1585 1585 dev_warn(db->dev, "%s: Invalid ethernet MAC address. Please " 1586 1586 "set using ifconfig\n", ndev->name); 1587 1587 1588 - random_ether_addr(ndev->dev_addr); 1588 + eth_hw_addr_random(ndev); 1589 1589 mac_src = "random"; 1590 1590 } 1591 1591
+1 -1
drivers/net/ethernet/dnet.c
··· 895 895 896 896 if (!is_valid_ether_addr(dev->dev_addr)) { 897 897 /* choose a random ethernet address */ 898 - random_ether_addr(dev->dev_addr); 898 + eth_hw_addr_random(dev); 899 899 __dnet_set_hwaddr(bp); 900 900 } 901 901
+1 -1
drivers/net/ethernet/faraday/ftgmac100.c
··· 1289 1289 netdev_info(netdev, "irq %d, mapped at %p\n", priv->irq, priv->base); 1290 1290 1291 1291 if (!is_valid_ether_addr(netdev->dev_addr)) { 1292 - random_ether_addr(netdev->dev_addr); 1292 + eth_hw_addr_random(netdev); 1293 1293 netdev_info(netdev, "generated random MAC address %pM\n", 1294 1294 netdev->dev_addr); 1295 1295 }
+1 -1
drivers/net/ethernet/faraday/ftmac100.c
··· 1133 1133 netdev_info(netdev, "irq %d, mapped at %p\n", priv->irq, priv->base); 1134 1134 1135 1135 if (!is_valid_ether_addr(netdev->dev_addr)) { 1136 - random_ether_addr(netdev->dev_addr); 1136 + eth_hw_addr_random(netdev); 1137 1137 netdev_info(netdev, "generated random MAC address %pM\n", 1138 1138 netdev->dev_addr); 1139 1139 }
+1 -1
drivers/net/ethernet/mipsnet.c
··· 281 281 * Lacking any better mechanism to allocate a MAC address we use a 282 282 * random one ... 283 283 */ 284 - random_ether_addr(netdev->dev_addr); 284 + eth_hw_addr_random(netdev); 285 285 286 286 err = register_netdev(netdev); 287 287 if (err) {
+1 -1
drivers/net/ethernet/natsemi/macsonic.c
··· 307 307 308 308 printk(KERN_WARNING "macsonic: MAC address in CAM entry 15 " 309 309 "seems invalid, will use a random MAC\n"); 310 - random_ether_addr(dev->dev_addr); 310 + eth_hw_addr_random(dev); 311 311 } 312 312 313 313 static int __devinit mac_onboard_sonic_probe(struct net_device *dev)
+1 -1
drivers/net/ethernet/rdc/r6040.c
··· 1151 1151 if (!(adrp[0] || adrp[1] || adrp[2])) { 1152 1152 netdev_warn(dev, "MAC address not initialized, " 1153 1153 "generating random\n"); 1154 - random_ether_addr(dev->dev_addr); 1154 + eth_hw_addr_random(dev); 1155 1155 } 1156 1156 1157 1157 /* Link new device into r6040_root_dev */
+1 -1
drivers/net/ethernet/sis/sis900.c
··· 527 527 ret = sis900_get_mac_addr(pci_dev, net_dev); 528 528 529 529 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); 531 531 printk(KERN_WARNING "%s: Unreadable or invalid MAC address," 532 532 "using random generated one\n", dev_name); 533 533 }
+2 -3
drivers/net/ethernet/smsc/smsc9420.c
··· 509 509 smsc_dbg(PROBE, "Mac Address is read from EEPROM"); 510 510 } else { 511 511 /* eeprom values are invalid, generate random MAC */ 512 - random_ether_addr(dev->dev_addr); 512 + eth_hw_addr_random(dev); 513 513 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"); 516 515 } 517 516 } 518 517 }
+1 -1
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
··· 910 910 priv->dev->base_addr, 911 911 priv->dev->dev_addr, 0); 912 912 if (!is_valid_ether_addr(priv->dev->dev_addr)) 913 - random_ether_addr(priv->dev->dev_addr); 913 + eth_hw_addr_random(priv->dev); 914 914 } 915 915 pr_warning("%s: device MAC address %pM\n", priv->dev->name, 916 916 priv->dev->dev_addr);
+1 -1
drivers/net/ethernet/toshiba/tc35815.c
··· 849 849 /* Retrieve the ethernet address. */ 850 850 if (tc35815_init_dev_addr(dev)) { 851 851 dev_warn(&pdev->dev, "not valid ether addr\n"); 852 - random_ether_addr(dev->dev_addr); 852 + eth_hw_addr_random(dev); 853 853 } 854 854 855 855 rc = register_netdev(dev);
+1 -1
drivers/net/ethernet/via/via-rhine.c
··· 983 983 if (!is_valid_ether_addr(dev->dev_addr)) { 984 984 /* Report it and use a random ethernet address instead */ 985 985 netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr); 986 - random_ether_addr(dev->dev_addr); 986 + eth_hw_addr_random(dev); 987 987 netdev_info(dev, "Using random MAC address: %pM\n", 988 988 dev->dev_addr); 989 989 }
+1 -1
drivers/net/ifb.c
··· 184 184 dev->flags |= IFF_NOARP; 185 185 dev->flags &= ~IFF_MULTICAST; 186 186 dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING); 187 - random_ether_addr(dev->dev_addr); 187 + eth_hw_addr_random(dev); 188 188 } 189 189 190 190 static netdev_tx_t ifb_xmit(struct sk_buff *skb, struct net_device *dev)
+1 -1
drivers/net/tun.c
··· 531 531 ether_setup(dev); 532 532 dev->priv_flags &= ~IFF_TX_SKB_SHARING; 533 533 534 - random_ether_addr(dev->dev_addr); 534 + eth_hw_addr_random(dev); 535 535 536 536 dev->tx_queue_len = TUN_READQ_SIZE; /* We prefer our own queue length */ 537 537 break;
+1 -1
drivers/net/usb/smsc75xx.c
··· 615 615 } 616 616 617 617 /* 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); 619 619 netif_dbg(dev, ifup, dev->net, "MAC address set to random_ether_addr"); 620 620 } 621 621
+1 -1
drivers/net/usb/smsc95xx.c
··· 614 614 } 615 615 616 616 /* 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); 618 618 netif_dbg(dev, ifup, dev->net, "MAC address set to random_ether_addr\n"); 619 619 } 620 620
+2 -2
drivers/net/veth.c
··· 346 346 } 347 347 348 348 if (tbp[IFLA_ADDRESS] == NULL) 349 - random_ether_addr(peer->dev_addr); 349 + eth_hw_addr_random(peer); 350 350 351 351 err = register_netdevice(peer); 352 352 put_net(net); ··· 368 368 */ 369 369 370 370 if (tb[IFLA_ADDRESS] == NULL) 371 - random_ether_addr(dev->dev_addr); 371 + eth_hw_addr_random(dev); 372 372 373 373 if (tb[IFLA_IFNAME]) 374 374 nla_strlcpy(dev->name, tb[IFLA_IFNAME], IFNAMSIZ);
+1 -1
drivers/net/virtio_net.c
··· 1060 1060 if (virtio_config_val_len(vdev, VIRTIO_NET_F_MAC, 1061 1061 offsetof(struct virtio_net_config, mac), 1062 1062 dev->dev_addr, dev->addr_len) < 0) 1063 - random_ether_addr(dev->dev_addr); 1063 + eth_hw_addr_random(dev); 1064 1064 1065 1065 /* Set up our device-specific information */ 1066 1066 vi = netdev_priv(dev);
+1 -1
drivers/net/wan/hdlc_fr.c
··· 1087 1087 } 1088 1088 1089 1089 if (type == ARPHRD_ETHER) 1090 - random_ether_addr(dev->dev_addr); 1090 + eth_hw_addr_random(dev); 1091 1091 else { 1092 1092 *(__be16*)dev->dev_addr = htons(dlci); 1093 1093 dlci_to_q922(dev->broadcast, dlci);
+1 -1
drivers/net/wan/hdlc_raw_eth.c
··· 101 101 old_qlen = dev->tx_queue_len; 102 102 ether_setup(dev); 103 103 dev->tx_queue_len = old_qlen; 104 - random_ether_addr(dev->dev_addr); 104 + eth_hw_addr_random(dev); 105 105 netif_dormant_off(dev); 106 106 return 0; 107 107 }
+1 -1
net/ipv4/ip_gre.c
··· 1536 1536 return -EEXIST; 1537 1537 1538 1538 if (dev->type == ARPHRD_ETHER && !tb[IFLA_ADDRESS]) 1539 - random_ether_addr(dev->dev_addr); 1539 + eth_hw_addr_random(dev); 1540 1540 1541 1541 mtu = ipgre_tunnel_bind_dev(dev); 1542 1542 if (!tb[IFLA_MTU])
+1 -1
net/l2tp/l2tp_eth.c
··· 64 64 struct l2tp_eth *priv = netdev_priv(dev); 65 65 66 66 priv->dev = dev; 67 - random_ether_addr(dev->dev_addr); 67 + eth_hw_addr_random(dev); 68 68 memset(&dev->broadcast[0], 0xff, 6); 69 69 70 70 return 0;