[PATCH] uml: don't roll my own random MAC generator

fade5d54 · Jeff Dike <[email protected]> · 2006-09-29 01:58:53 -07:00

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 <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: fade5d5461b0379b27ca96faf560d855d7a0ea8b
Parents: 3b89af76

Changes

3 files changed · +1 −34

File	Status	Add	Del	Content
arch/um/drivers/net_kern.c	modified	+1	−3	View file
arch/um/drivers/net_user.c	modified	+0	−29	View file
arch/um/include/net_user.h	modified	+0	−2	View file

arch/um/drivers/net_kern.c

View file

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);

arch/um/drivers/net_user.c

View file

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;
-}

arch/um/include/net_user.h

View file

diff --git a/arch/um/include/net_user.h b/arch/um/include/net_user.h
index 99b3cea..19f207c 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