aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-07-12 15:33:08 -0400
committerDavid S. Miller <davem@davemloft.net>2012-07-17 01:38:28 -0400
commitf4f7f4143cf7d6a31bc9797f00f765d0174603cb (patch)
tree394c526a63fb4c4e56361a47abe1790e2a6e54fd /drivers
parentc7e12ead5f92413234b3d9f4f35ae56734decd21 (diff)
wireless: Use eth_random_addr
Convert the existing uses of random_ether_addr to the new eth_random_addr. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Hin-Tak Leung <htl10@users.sourceforge.net> Acked-by: Gertjan van Wingerde <gwingerde@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/adm8211.c2
-rw-r--r--drivers/net/wireless/p54/eeprom.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt2400pci.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt2500pci.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt2500usb.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt2800lib.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt61pci.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt73usb.c2
-rw-r--r--drivers/net/wireless/rtl818x/rtl8180/dev.c2
-rw-r--r--drivers/net/wireless/rtl818x/rtl8187/dev.c2
10 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index 97afcec24759..689a71c1af71 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -1854,7 +1854,7 @@ static int __devinit adm8211_probe(struct pci_dev *pdev,
1854 if (!is_valid_ether_addr(perm_addr)) { 1854 if (!is_valid_ether_addr(perm_addr)) {
1855 printk(KERN_WARNING "%s (adm8211): Invalid hwaddr in EEPROM!\n", 1855 printk(KERN_WARNING "%s (adm8211): Invalid hwaddr in EEPROM!\n",
1856 pci_name(pdev)); 1856 pci_name(pdev));
1857 random_ether_addr(perm_addr); 1857 eth_random_addr(perm_addr);
1858 } 1858 }
1859 SET_IEEE80211_PERM_ADDR(dev, perm_addr); 1859 SET_IEEE80211_PERM_ADDR(dev, perm_addr);
1860 1860
diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/p54/eeprom.c
index 636daf2860cc..14037092ba89 100644
--- a/drivers/net/wireless/p54/eeprom.c
+++ b/drivers/net/wireless/p54/eeprom.c
@@ -857,7 +857,7 @@ good_eeprom:
857 857
858 wiphy_warn(dev->wiphy, 858 wiphy_warn(dev->wiphy,
859 "Invalid hwaddr! Using randomly generated MAC addr\n"); 859 "Invalid hwaddr! Using randomly generated MAC addr\n");
860 random_ether_addr(perm_addr); 860 eth_random_addr(perm_addr);
861 SET_IEEE80211_PERM_ADDR(dev, perm_addr); 861 SET_IEEE80211_PERM_ADDR(dev, perm_addr);
862 } 862 }
863 863
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index 5e6b50143165..8b9dbd76a252 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -1455,7 +1455,7 @@ static int rt2400pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
1455 */ 1455 */
1456 mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0); 1456 mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
1457 if (!is_valid_ether_addr(mac)) { 1457 if (!is_valid_ether_addr(mac)) {
1458 random_ether_addr(mac); 1458 eth_random_addr(mac);
1459 EEPROM(rt2x00dev, "MAC: %pM\n", mac); 1459 EEPROM(rt2x00dev, "MAC: %pM\n", mac);
1460 } 1460 }
1461 1461
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 136b849f11b5..d2cf8a4bc8b5 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1585,7 +1585,7 @@ static int rt2500pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
1585 */ 1585 */
1586 mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0); 1586 mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
1587 if (!is_valid_ether_addr(mac)) { 1587 if (!is_valid_ether_addr(mac)) {
1588 random_ether_addr(mac); 1588 eth_random_addr(mac);
1589 EEPROM(rt2x00dev, "MAC: %pM\n", mac); 1589 EEPROM(rt2x00dev, "MAC: %pM\n", mac);
1590 } 1590 }
1591 1591
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 669aecdb411d..3aae36bb0a9e 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1352,7 +1352,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
1352 */ 1352 */
1353 mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0); 1353 mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
1354 if (!is_valid_ether_addr(mac)) { 1354 if (!is_valid_ether_addr(mac)) {
1355 random_ether_addr(mac); 1355 eth_random_addr(mac);
1356 EEPROM(rt2x00dev, "MAC: %pM\n", mac); 1356 EEPROM(rt2x00dev, "MAC: %pM\n", mac);
1357 } 1357 }
1358 1358
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index e76f03c9b468..88455b1b9fe0 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -4335,7 +4335,7 @@ int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)
4335 */ 4335 */
4336 mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0); 4336 mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
4337 if (!is_valid_ether_addr(mac)) { 4337 if (!is_valid_ether_addr(mac)) {
4338 random_ether_addr(mac); 4338 eth_random_addr(mac);
4339 EEPROM(rt2x00dev, "MAC: %pM\n", mac); 4339 EEPROM(rt2x00dev, "MAC: %pM\n", mac);
4340 } 4340 }
4341 4341
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index ee22bd74579d..f32259686b45 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2415,7 +2415,7 @@ static int rt61pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
2415 */ 2415 */
2416 mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0); 2416 mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
2417 if (!is_valid_ether_addr(mac)) { 2417 if (!is_valid_ether_addr(mac)) {
2418 random_ether_addr(mac); 2418 eth_random_addr(mac);
2419 EEPROM(rt2x00dev, "MAC: %pM\n", mac); 2419 EEPROM(rt2x00dev, "MAC: %pM\n", mac);
2420 } 2420 }
2421 2421
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 77ccbbc7da41..ba6e434b859d 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1770,7 +1770,7 @@ static int rt73usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
1770 */ 1770 */
1771 mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0); 1771 mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
1772 if (!is_valid_ether_addr(mac)) { 1772 if (!is_valid_ether_addr(mac)) {
1773 random_ether_addr(mac); 1773 eth_random_addr(mac);
1774 EEPROM(rt2x00dev, "MAC: %pM\n", mac); 1774 EEPROM(rt2x00dev, "MAC: %pM\n", mac);
1775 } 1775 }
1776 1776
diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c
index 3b505395d869..aceaf689f737 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c
@@ -1078,7 +1078,7 @@ static int __devinit rtl8180_probe(struct pci_dev *pdev,
1078 if (!is_valid_ether_addr(mac_addr)) { 1078 if (!is_valid_ether_addr(mac_addr)) {
1079 printk(KERN_WARNING "%s (rtl8180): Invalid hwaddr! Using" 1079 printk(KERN_WARNING "%s (rtl8180): Invalid hwaddr! Using"
1080 " randomly generated MAC addr\n", pci_name(pdev)); 1080 " randomly generated MAC addr\n", pci_name(pdev));
1081 random_ether_addr(mac_addr); 1081 eth_random_addr(mac_addr);
1082 } 1082 }
1083 SET_IEEE80211_PERM_ADDR(dev, mac_addr); 1083 SET_IEEE80211_PERM_ADDR(dev, mac_addr);
1084 1084
diff --git a/drivers/net/wireless/rtl818x/rtl8187/dev.c b/drivers/net/wireless/rtl818x/rtl8187/dev.c
index 4fb1ca1b86b9..71a30b026089 100644
--- a/drivers/net/wireless/rtl818x/rtl8187/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c
@@ -1486,7 +1486,7 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
1486 if (!is_valid_ether_addr(mac_addr)) { 1486 if (!is_valid_ether_addr(mac_addr)) {
1487 printk(KERN_WARNING "rtl8187: Invalid hwaddr! Using randomly " 1487 printk(KERN_WARNING "rtl8187: Invalid hwaddr! Using randomly "
1488 "generated MAC address\n"); 1488 "generated MAC address\n");
1489 random_ether_addr(mac_addr); 1489 eth_random_addr(mac_addr);
1490 } 1490 }
1491 SET_IEEE80211_PERM_ADDR(dev, mac_addr); 1491 SET_IEEE80211_PERM_ADDR(dev, mac_addr);
1492 1492