aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/drivers/net_user.c
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-09-29 04:58:53 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 12:18:04 -0400
commitfade5d5461b0379b27ca96faf560d855d7a0ea8b (patch)
treee12b7753db8c4dcb7f5fd187062eb5e055526228 /arch/um/drivers/net_user.c
parent3b89af765cd62c1c3ca6c81adca45084f8840e06 (diff)
[PATCH] uml: don't roll my own random MAC generator
Use the existing random_ether_addr() instead of cooking up my own version. Pointed out by Dave Hollis and Jason Lunz. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/drivers/net_user.c')
-rw-r--r--arch/um/drivers/net_user.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 142bcb2c7c6a..f3a3f8a29c7a 100644
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -259,32 +259,3 @@ char *split_if_spec(char *str, ...)
259 va_end(ap); 259 va_end(ap);
260 return str; 260 return str;
261} 261}
262
263void random_mac(unsigned char *addr)
264{
265 struct timeval tv;
266 long n;
267 unsigned int seed;
268
269 gettimeofday(&tv, NULL);
270
271 /* Assume that 20 bits of microseconds and 12 bits of the pid are
272 * reasonably unpredictable.
273 */
274 seed = tv.tv_usec | (os_getpid() << 20);
275 srandom(seed);
276
277 /* Don't care about endianness here - switching endianness
278 * just rearranges what are hopefully random numbers.
279 *
280 * Assume that RAND_MAX > 65536, so random is called twice and
281 * we use 16 bits of the result.
282 */
283 n = random();
284 addr[2] = (n >> 8) & 255;
285 addr[3] = n % 255;
286
287 n = random();
288 addr[4] = (n >> 8) & 255;
289 addr[5] = n % 255;
290}