aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-07-13 01:33:12 -0400
committerDavid S. Miller <davem@davemloft.net>2012-07-17 01:39:25 -0400
commit6e5928f6dfd92a47c489bb735c4cb8bbb62038e0 (patch)
tree95f49ca2c94bfee44f85882fe58aecf10a6b35e1 /arch/mips
parent006c9139f7a90d3419381a59ac76f42612f94c14 (diff)
arch: 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: Mike Frysinger <vapier@gentoo.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/ar7/platform.c4
-rw-r--r--arch/mips/powertv/powertv_setup.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
index 1a24d317e7a3..1bbc24b08685 100644
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
@@ -310,10 +310,10 @@ static void __init cpmac_get_mac(int instance, unsigned char *dev_addr)
310 &dev_addr[4], &dev_addr[5]) != 6) { 310 &dev_addr[4], &dev_addr[5]) != 6) {
311 pr_warning("cannot parse mac address, " 311 pr_warning("cannot parse mac address, "
312 "using random address\n"); 312 "using random address\n");
313 random_ether_addr(dev_addr); 313 eth_random_addr(dev_addr);
314 } 314 }
315 } else 315 } else
316 random_ether_addr(dev_addr); 316 eth_random_addr(dev_addr);
317} 317}
318 318
319/***************************************************************************** 319/*****************************************************************************
diff --git a/arch/mips/powertv/powertv_setup.c b/arch/mips/powertv/powertv_setup.c
index 3933c373a438..820b8480f222 100644
--- a/arch/mips/powertv/powertv_setup.c
+++ b/arch/mips/powertv/powertv_setup.c
@@ -254,7 +254,7 @@ early_param("rfmac", rfmac_param);
254 * Generates an Ethernet MAC address that is highly likely to be unique for 254 * Generates an Ethernet MAC address that is highly likely to be unique for
255 * this particular system on a network with other systems of the same type. 255 * this particular system on a network with other systems of the same type.
256 * 256 *
257 * The problem we are solving is that, when random_ether_addr() is used to 257 * The problem we are solving is that, when eth_random_addr() is used to
258 * generate MAC addresses at startup, there isn't much entropy for the random 258 * generate MAC addresses at startup, there isn't much entropy for the random
259 * number generator to use and the addresses it produces are fairly likely to 259 * number generator to use and the addresses it produces are fairly likely to
260 * be the same as those of other identical systems on the same local network. 260 * be the same as those of other identical systems on the same local network.
@@ -269,7 +269,7 @@ early_param("rfmac", rfmac_param);
269 * Still, this does give us something to work with. 269 * Still, this does give us something to work with.
270 * 270 *
271 * The approach we take is: 271 * The approach we take is:
272 * 1. If we can't get the RF MAC Address, just call random_ether_addr. 272 * 1. If we can't get the RF MAC Address, just call eth_random_addr.
273 * 2. Use the 24-bit NIC-specific bits of the RF MAC address as the last 24 273 * 2. Use the 24-bit NIC-specific bits of the RF MAC address as the last 24
274 * bits of the new address. This is very likely to be unique, except for 274 * bits of the new address. This is very likely to be unique, except for
275 * the current box. 275 * the current box.
@@ -299,7 +299,7 @@ void platform_random_ether_addr(u8 addr[ETH_ALEN])
299 if (!have_rfmac) { 299 if (!have_rfmac) {
300 pr_warning("rfmac not available on command line; " 300 pr_warning("rfmac not available on command line; "
301 "generating random MAC address\n"); 301 "generating random MAC address\n");
302 random_ether_addr(addr); 302 eth_random_addr(addr);
303 } 303 }
304 304
305 else { 305 else {