Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Jeff Dike 2006-09-29 01:58:53 -07:00 committed by Linus Torvalds
parent 3b89af765c
commit fade5d5461
3 changed files with 1 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/um/drivers/net_kern.c
View file

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

29
arch/um/drivers/net_user.c
View file

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

2
arch/um/include/net_user.h
View file

@ -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