kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net: replace random_ether_addr() with eth_hw_addr_random()

Browse source 
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>
This commit is contained in:
Danny Kukawka 2012-02-15 06:45:39 +00:00 committed by David S. Miller
parent a1e785e02b
commit f2cedb63df
24 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/ethernet/cadence/macb.c
View file

@ -87,7 +87,7 @@ static void __init macb_get_hwaddr(struct macb *bp)
memcpy(bp->dev->dev_addr, addr, sizeof(addr)); memcpy(bp->dev->dev_addr, addr, sizeof(addr));
} else { } else {
netdev_info(bp->dev, "invalid hw address, using random\n"); netdev_info(bp->dev, "invalid hw address, using random\n");
random_ether_addr(bp->dev->dev_addr); eth_hw_addr_random(bp->dev);
} }
} }

2
drivers/net/ethernet/cirrus/ep93xx_eth.c
View file

@ -859,7 +859,7 @@ static int ep93xx_eth_probe(struct platform_device *pdev)
ep->mdc_divisor = 40; /* Max HCLK 100 MHz, min MDIO clk 2.5 MHz. */ ep->mdc_divisor = 40; /* Max HCLK 100 MHz, min MDIO clk 2.5 MHz. */
if (is_zero_ether_addr(dev->dev_addr)) if (is_zero_ether_addr(dev->dev_addr))
random_ether_addr(dev->dev_addr); eth_hw_addr_random(dev);
err = register_netdev(dev); err = register_netdev(dev);
if (err) { if (err) {

2
drivers/net/ethernet/davicom/dm9000.c
View file

@ -1585,7 +1585,7 @@ dm9000_probe(struct platform_device *pdev)
dev_warn(db->dev, "%s: Invalid ethernet MAC address. Please " dev_warn(db->dev, "%s: Invalid ethernet MAC address. Please "
"set using ifconfig\n", ndev->name); "set using ifconfig\n", ndev->name);
random_ether_addr(ndev->dev_addr); eth_hw_addr_random(ndev);
mac_src = "random"; mac_src = "random";
} }

2
drivers/net/ethernet/dnet.c
View file

@ -895,7 +895,7 @@ static int __devinit dnet_probe(struct platform_device *pdev)
if (!is_valid_ether_addr(dev->dev_addr)) { if (!is_valid_ether_addr(dev->dev_addr)) {
/* choose a random ethernet address */ /* choose a random ethernet address */
random_ether_addr(dev->dev_addr); eth_hw_addr_random(dev);
__dnet_set_hwaddr(bp); __dnet_set_hwaddr(bp);
} }

2
drivers/net/ethernet/faraday/ftgmac100.c
View file

@ -1289,7 +1289,7 @@ static int ftgmac100_probe(struct platform_device *pdev)
netdev_info(netdev, "irq %d, mapped at %p\n", priv->irq, priv->base); netdev_info(netdev, "irq %d, mapped at %p\n", priv->irq, priv->base);
if (!is_valid_ether_addr(netdev->dev_addr)) { if (!is_valid_ether_addr(netdev->dev_addr)) {
random_ether_addr(netdev->dev_addr); eth_hw_addr_random(netdev);
netdev_info(netdev, "generated random MAC address %pM\n", netdev_info(netdev, "generated random MAC address %pM\n",
netdev->dev_addr); netdev->dev_addr);
} }

2
drivers/net/ethernet/faraday/ftmac100.c
View file

@ -1133,7 +1133,7 @@ static int ftmac100_probe(struct platform_device *pdev)
netdev_info(netdev, "irq %d, mapped at %p\n", priv->irq, priv->base); netdev_info(netdev, "irq %d, mapped at %p\n", priv->irq, priv->base);
if (!is_valid_ether_addr(netdev->dev_addr)) { if (!is_valid_ether_addr(netdev->dev_addr)) {
random_ether_addr(netdev->dev_addr); eth_hw_addr_random(netdev);
netdev_info(netdev, "generated random MAC address %pM\n", netdev_info(netdev, "generated random MAC address %pM\n",
netdev->dev_addr); netdev->dev_addr);
} }

2
drivers/net/ethernet/mipsnet.c
View file

@ -281,7 +281,7 @@ static int __devinit mipsnet_probe(struct platform_device *dev)
* Lacking any better mechanism to allocate a MAC address we use a * Lacking any better mechanism to allocate a MAC address we use a
* random one ... * random one ...
*/ */
random_ether_addr(netdev->dev_addr); eth_hw_addr_random(netdev);
err = register_netdev(netdev); err = register_netdev(netdev);
if (err) { if (err) {

2
drivers/net/ethernet/natsemi/macsonic.c
View file

@ -307,7 +307,7 @@ static void __devinit mac_onboard_sonic_ethernet_addr(struct net_device *dev)
printk(KERN_WARNING "macsonic: MAC address in CAM entry 15 " printk(KERN_WARNING "macsonic: MAC address in CAM entry 15 "
"seems invalid, will use a random MAC\n"); "seems invalid, will use a random MAC\n");
random_ether_addr(dev->dev_addr); eth_hw_addr_random(dev);
} }
static int __devinit mac_onboard_sonic_probe(struct net_device *dev) static int __devinit mac_onboard_sonic_probe(struct net_device *dev)

2
drivers/net/ethernet/rdc/r6040.c
View file

@ -1151,7 +1151,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
if (!(adrp[0] || adrp[1] || adrp[2])) { if (!(adrp[0] || adrp[1] || adrp[2])) {
netdev_warn(dev, "MAC address not initialized, " netdev_warn(dev, "MAC address not initialized, "
"generating random\n"); "generating random\n");
random_ether_addr(dev->dev_addr); eth_hw_addr_random(dev);
} }
/* Link new device into r6040_root_dev */ /* Link new device into r6040_root_dev */

2
drivers/net/ethernet/sis/sis900.c
View file

@ -527,7 +527,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
ret = sis900_get_mac_addr(pci_dev, net_dev); ret = sis900_get_mac_addr(pci_dev, net_dev);
if (!ret || !is_valid_ether_addr(net_dev->dev_addr)) { if (!ret || !is_valid_ether_addr(net_dev->dev_addr)) {
random_ether_addr(net_dev->dev_addr); eth_hw_addr_random(net_dev);
printk(KERN_WARNING "%s: Unreadable or invalid MAC address," printk(KERN_WARNING "%s: Unreadable or invalid MAC address,"
"using random generated one\n", dev_name); "using random generated one\n", dev_name);
} }

5
drivers/net/ethernet/smsc/smsc9420.c
View file

@ -509,10 +509,9 @@ static void smsc9420_check_mac_address(struct net_device *dev)
smsc_dbg(PROBE, "Mac Address is read from EEPROM"); smsc_dbg(PROBE, "Mac Address is read from EEPROM");
} else { } else {
/* eeprom values are invalid, generate random MAC */ /* eeprom values are invalid, generate random MAC */
random_ether_addr(dev->dev_addr); eth_hw_addr_random(dev);
smsc9420_set_mac_address(dev); smsc9420_set_mac_address(dev);
smsc_dbg(PROBE, smsc_dbg(PROBE, "MAC Address is set to random");
"MAC Address is set to random_ether_addr");
} }
} }
} }

2
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
View file

@ -910,7 +910,7 @@ static void stmmac_check_ether_addr(struct stmmac_priv *priv)
priv->dev->base_addr, priv->dev->base_addr,
priv->dev->dev_addr, 0); priv->dev->dev_addr, 0);
if (!is_valid_ether_addr(priv->dev->dev_addr)) if (!is_valid_ether_addr(priv->dev->dev_addr))
random_ether_addr(priv->dev->dev_addr); eth_hw_addr_random(priv->dev);
} }
pr_warning("%s: device MAC address %pM\n", priv->dev->name, pr_warning("%s: device MAC address %pM\n", priv->dev->name,
priv->dev->dev_addr); priv->dev->dev_addr);

2
drivers/net/ethernet/toshiba/tc35815.c
View file

@ -849,7 +849,7 @@ static int __devinit tc35815_init_one(struct pci_dev *pdev,
/* Retrieve the ethernet address. */ /* Retrieve the ethernet address. */
if (tc35815_init_dev_addr(dev)) { if (tc35815_init_dev_addr(dev)) {
dev_warn(&pdev->dev, "not valid ether addr\n"); dev_warn(&pdev->dev, "not valid ether addr\n");
random_ether_addr(dev->dev_addr); eth_hw_addr_random(dev);
} }
rc = register_netdev(dev); rc = register_netdev(dev);

2
drivers/net/ethernet/via/via-rhine.c
View file

@ -983,7 +983,7 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
if (!is_valid_ether_addr(dev->dev_addr)) { if (!is_valid_ether_addr(dev->dev_addr)) {
/* Report it and use a random ethernet address instead */ /* Report it and use a random ethernet address instead */
netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr); netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr);
random_ether_addr(dev->dev_addr); eth_hw_addr_random(dev);
netdev_info(dev, "Using random MAC address: %pM\n", netdev_info(dev, "Using random MAC address: %pM\n",
dev->dev_addr); dev->dev_addr);
} }

2
drivers/net/ifb.c
View file

@ -184,7 +184,7 @@ static void ifb_setup(struct net_device *dev)
dev->flags |= IFF_NOARP; dev->flags |= IFF_NOARP;
dev->flags &= ~IFF_MULTICAST; dev->flags &= ~IFF_MULTICAST;
dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING); dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING);
random_ether_addr(dev->dev_addr); eth_hw_addr_random(dev);
} }
static netdev_tx_t ifb_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t ifb_xmit(struct sk_buff *skb, struct net_device *dev)

2
drivers/net/tun.c
View file

@ -531,7 +531,7 @@ static void tun_net_init(struct net_device *dev)
ether_setup(dev); ether_setup(dev);
dev->priv_flags &= ~IFF_TX_SKB_SHARING; dev->priv_flags &= ~IFF_TX_SKB_SHARING;
random_ether_addr(dev->dev_addr); eth_hw_addr_random(dev);
dev->tx_queue_len = TUN_READQ_SIZE; /* We prefer our own queue length */ dev->tx_queue_len = TUN_READQ_SIZE; /* We prefer our own queue length */
break; break;

2
drivers/net/usb/smsc75xx.c
View file

@ -615,7 +615,7 @@ static void smsc75xx_init_mac_address(struct usbnet *dev)
} }
/* no eeprom, or eeprom values are invalid. generate random MAC */ /* no eeprom, or eeprom values are invalid. generate random MAC */
random_ether_addr(dev->net->dev_addr); eth_hw_addr_random(dev->net);
netif_dbg(dev, ifup, dev->net, "MAC address set to random_ether_addr"); netif_dbg(dev, ifup, dev->net, "MAC address set to random_ether_addr");
} }

2
drivers/net/usb/smsc95xx.c
View file

@ -614,7 +614,7 @@ static void smsc95xx_init_mac_address(struct usbnet *dev)
} }
/* no eeprom, or eeprom values are invalid. generate random MAC */ /* no eeprom, or eeprom values are invalid. generate random MAC */
random_ether_addr(dev->net->dev_addr); eth_hw_addr_random(dev->net);
netif_dbg(dev, ifup, dev->net, "MAC address set to random_ether_addr\n"); netif_dbg(dev, ifup, dev->net, "MAC address set to random_ether_addr\n");
} }

4
drivers/net/veth.c
View file

@ -346,7 +346,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
} }
if (tbp[IFLA_ADDRESS] == NULL) if (tbp[IFLA_ADDRESS] == NULL)
random_ether_addr(peer->dev_addr); eth_hw_addr_random(peer);
err = register_netdevice(peer); err = register_netdevice(peer);
put_net(net); put_net(net);
@ -368,7 +368,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
*/ */
if (tb[IFLA_ADDRESS] == NULL) if (tb[IFLA_ADDRESS] == NULL)
random_ether_addr(dev->dev_addr); eth_hw_addr_random(dev);
if (tb[IFLA_IFNAME]) if (tb[IFLA_IFNAME])
nla_strlcpy(dev->name, tb[IFLA_IFNAME], IFNAMSIZ); nla_strlcpy(dev->name, tb[IFLA_IFNAME], IFNAMSIZ);

2
drivers/net/virtio_net.c
View file

@ -1060,7 +1060,7 @@ static int virtnet_probe(struct virtio_device *vdev)
if (virtio_config_val_len(vdev, VIRTIO_NET_F_MAC, if (virtio_config_val_len(vdev, VIRTIO_NET_F_MAC,
offsetof(struct virtio_net_config, mac), offsetof(struct virtio_net_config, mac),
dev->dev_addr, dev->addr_len) < 0) dev->dev_addr, dev->addr_len) < 0)
random_ether_addr(dev->dev_addr); eth_hw_addr_random(dev);
/* Set up our device-specific information */ /* Set up our device-specific information */
vi = netdev_priv(dev); vi = netdev_priv(dev);

2
drivers/net/wan/hdlc_fr.c
View file

@ -1087,7 +1087,7 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
} }
if (type == ARPHRD_ETHER) if (type == ARPHRD_ETHER)
random_ether_addr(dev->dev_addr); eth_hw_addr_random(dev);
else { else {
*(__be16*)dev->dev_addr = htons(dlci); *(__be16*)dev->dev_addr = htons(dlci);
dlci_to_q922(dev->broadcast, dlci); dlci_to_q922(dev->broadcast, dlci);

2
drivers/net/wan/hdlc_raw_eth.c
View file

@ -101,7 +101,7 @@ static int raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr)
old_qlen = dev->tx_queue_len; old_qlen = dev->tx_queue_len;
ether_setup(dev); ether_setup(dev);
dev->tx_queue_len = old_qlen; dev->tx_queue_len = old_qlen;
random_ether_addr(dev->dev_addr); eth_hw_addr_random(dev);
netif_dormant_off(dev); netif_dormant_off(dev);
return 0; return 0;
} }

2
net/ipv4/ip_gre.c
View file

@ -1536,7 +1536,7 @@ static int ipgre_newlink(struct net *src_net, struct net_device *dev, struct nla
return -EEXIST; return -EEXIST;
if (dev->type == ARPHRD_ETHER && !tb[IFLA_ADDRESS]) if (dev->type == ARPHRD_ETHER && !tb[IFLA_ADDRESS])
random_ether_addr(dev->dev_addr); eth_hw_addr_random(dev);
mtu = ipgre_tunnel_bind_dev(dev); mtu = ipgre_tunnel_bind_dev(dev);
if (!tb[IFLA_MTU]) if (!tb[IFLA_MTU])

2
net/l2tp/l2tp_eth.c
View file

@ -64,7 +64,7 @@ static int l2tp_eth_dev_init(struct net_device *dev)
struct l2tp_eth *priv = netdev_priv(dev); struct l2tp_eth *priv = netdev_priv(dev);
priv->dev = dev; priv->dev = dev;
random_ether_addr(dev->dev_addr); eth_hw_addr_random(dev);
memset(&dev->broadcast[0], 0xff, 6); memset(&dev->broadcast[0], 0xff, 6);
return 0; return 0;