[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <65dd6fd50609291518s129786fbt1739c80533d1a36@mail.google.com>
Date: Fri, 29 Sep 2006 15:18:52 -0700
From: "Ollie Wild" <aaw@...gle.com>
To: "Jeff Dike" <jdike@...toit.com>
Cc: akpm@...l.org, linux-kernel@...r.kernel.org,
user-mode-linux-devel@...ts.sourceforge.net,
dhollis@...ehollis.com, "Jason Lunz" <lunz@...ooley.org>
Subject: Re: [PATCH 2/2] UML - Don't roll my own random MAC generator
This patch as provided breaks my build due to a missing semicolon.
Patch attached.
Ollie
On 9/28/06, Jeff Dike <jdike@...toit.com> wrote:
> 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@...toit.com>
> ---
>
> arch/um/drivers/net_kern.c | 4 +---
> arch/um/drivers/net_user.c | 29 -----------------------------
> arch/um/include/net_user.h | 2 --
> 3 files changed, 1 insertion(+), 34 deletions(-)
>
> Index: linux-2.6.18-mm/arch/um/drivers/net_kern.c
> ===================================================================
> --- linux-2.6.18-mm.orig/arch/um/drivers/net_kern.c 2006-09-28 12:51:50.000000000 -0400
> +++ linux-2.6.18-mm/arch/um/drivers/net_kern.c 2006-09-28 13:00:58.000000000 -0400
> @@ -309,9 +309,7 @@ static void setup_etheraddr(char *str, u
> return;
>
> random:
> - addr[0] = 0xfe;
> - addr[1] = 0xfd;
> - random_mac(addr);
> + random_ether_addr(addr)
> }
>
> static DEFINE_SPINLOCK(devices_lock);
> Index: linux-2.6.18-mm/arch/um/drivers/net_user.c
> ===================================================================
> --- linux-2.6.18-mm.orig/arch/um/drivers/net_user.c 2006-09-28 12:51:50.000000000 -0400
> +++ linux-2.6.18-mm/arch/um/drivers/net_user.c 2006-09-28 13:00:06.000000000 -0400
> @@ -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;
> -}
> Index: linux-2.6.18-mm/arch/um/include/net_user.h
> ===================================================================
> --- linux-2.6.18-mm.orig/arch/um/include/net_user.h 2006-09-28 12:15:48.000000000 -0400
> +++ linux-2.6.18-mm/arch/um/include/net_user.h 2006-09-28 13:01:51.000000000 -0400
> @@ -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
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
View attachment "random_ether_addr.patch" of type "text/x-patch" (344 bytes)
Powered by blists - more mailing lists