summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-09-29 01:58:53 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 09:18:04 -0700
commitfade5d5461b0379b27ca96faf560d855d7a0ea8b (patch)
treee12b7753db8c4dcb7f5fd187062eb5e055526228
parent3b89af765cd62c1c3ca6c81adca45084f8840e06 (diff)
downloadop-kernel-dev-fade5d5461b0379b27ca96faf560d855d7a0ea8b.zip
op-kernel-dev-fade5d5461b0379b27ca96faf560d855d7a0ea8b.tar.gz
[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>
-rw-r--r--arch/um/drivers/net_kern.c4
-rw-r--r--arch/um/drivers/net_user.c29
-rw-r--r--arch/um/include/net_user.h2
3 files changed, 1 insertions, 34 deletions
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index c067abb..16aa572 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -310,9 +310,7 @@ static void setup_etheraddr(char *str, unsigned char *addr)
return;
random:
- addr[0] = 0xfe;
- addr[1] = 0xfd;
- random_mac(addr);
+ random_ether_addr(addr)
}
static DEFINE_SPINLOCK(devices_lock);
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 142bcb2..f3a3f8a 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, ...)
va_end(ap);
return str;
}
-
-void random_mac(unsigned char *addr)
-{
- struct timeval tv;
- long n;
- unsigned int seed;
-
- gettimeofday(&tv, NULL);
-
- /* Assume that 20 bits of microseconds and 12 bits of the pid are
- * reasonably unpredictable.
- */
- seed = tv.tv_usec | (os_getpid() << 20);
- srandom(seed);
-
- /* Don't care about endianness here - switching endianness
- * just rearranges what are hopefully random numbers.
- *
- * Assume that RAND_MAX > 65536, so random is called twice and
- * we use 16 bits of the result.
- */
- n = random();
- addr[2] = (n >> 8) & 255;
- addr[3] = n % 255;
-
- n = random();
- addr[4] = (n >> 8) & 255;
- addr[5] = n % 255;
-}
diff --git a/arch/um/include/net_user.h b/arch/um/include/net_user.h
index 99b3cea..19f207cd 100644
--- a/arch/um/include/net_user.h
+++ b/arch/um/include/net_user.h
@@ -50,6 +50,4 @@ extern char *split_if_spec(char *str, ...);
extern int dev_netmask(void *d, void *m);
-extern void random_mac(unsigned char *addr);
-
#endif
OpenPOWER on IntegriCloud