uml: turn on SCSI support

[linux-2.6-omap-h63xx.git] / arch / um / drivers / net_user.c

diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 142bcb2c7c6ab43ffccd6444dbcb173da33c4a42..3503cff867c34d1166466c5da5acc6a14de3f46d 100644 (file)
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -14,10 +14,11 @@
 #include <sys/wait.h>
 #include <sys/time.h>
 #include "user.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "net_user.h"
 #include "os.h"
+#include "um_malloc.h"
+#include "kern_constants.h"
 
 int tap_open_common(void *dev, char *gate_addr)
 {
@@ -215,7 +216,7 @@ static void change(char *dev, char *what, unsigned char *addr,
        sprintf(netmask_buf, "%d.%d.%d.%d", netmask[0], netmask[1], 
                netmask[2], netmask[3]);
 
-       output_len = page_size();
+       output_len = UM_KERN_PAGE_SIZE;
        output = um_kmalloc(output_len);
        if(output == NULL)
                printk("change : failed to allocate output buffer\n");
@@ -259,32 +260,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;
-}