aboutsummaryrefslogtreecommitdiff
path: root/arch/um/drivers/net_kern.c
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-09-29 01:58:46 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 09:18:04 -0700
commitf3e7ed2b617824f79d1223f37430ccffae59e5b8 (patch)
tree629961c5ea7aa34675c8a6760e88e3957099f0af /arch/um/drivers/net_kern.c
parent3b08606dc2991bcdab14139efd9ed9d492f5f901 (diff)
[PATCH] uml: assign random MACs to interfaces if necessary
Assign a random MAC to an ethernet interface if one was not provided on the command line. This became pressing when distros started bringing interfaces up before assigning IPs to them. The previous pattern of assigning an IP then bringing it up allowed the MAC to be generated from the first IP assigned. However, once the thing is up, it's probably a bad idea to change the MAC, so the MAC stayed initialized to fe:fd:0:0:0:0. Now, if there is no MAC from the command line, one is generated. We use the microseconds from gettimeofday (20 bits), plus the low 12 bits of the pid to seed the random number generator. random() is called twice, with 16 bits of each result used. I didn't want to have to try to fill in 32 bits optimally given an arbitrary RAND_MAX, so I just assume that it is greater than 65536 and use 16 bits of each random() return. There is also a bit of reformatting and whitespace cleanup here. 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_kern.c')
-rw-r--r--arch/um/drivers/net_kern.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index bd1178fa4e9..684a1ef93c8 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -753,7 +753,8 @@ int setup_etheraddr(char *str, unsigned char *addr)
int i;
if(str == NULL)
- return(0);
+ goto random;
+
for(i=0;i<6;i++){
addr[i] = simple_strtoul(str, &end, 16);
if((end == str) ||
@@ -761,7 +762,7 @@ int setup_etheraddr(char *str, unsigned char *addr)
printk(KERN_ERR
"setup_etheraddr: failed to parse '%s' "
"as an ethernet address\n", str);
- return(0);
+ goto random;
}
str = end + 1;
}
@@ -769,9 +770,15 @@ int setup_etheraddr(char *str, unsigned char *addr)
printk(KERN_ERR
"Attempt to assign a broadcast ethernet address to a "
"device disallowed\n");
- return(0);
+ goto random;
}
- return(1);
+ return 1;
+
+random:
+ addr[0] = 0xfe;
+ addr[1] = 0xfd;
+ random_mac(addr);
+ return 1;
}
void dev_ip_addr(void *d, unsigned char *bin_buf)