[PATCH] uml: assign random MACs to interfaces if necessary

[linux-2.6] / arch / um / drivers / net_kern.c

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 664c2e2fb8209de464e27a951407e7d9fb58ae56..684a1ef93c87e888fae13ad8989f399b0fe39501 100644 (file)
--- 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)
@@ -825,7 +832,7 @@ int dev_netmask(void *d, void *m)
        struct net_device *dev = d;
        struct in_device *ip = dev->ip_ptr;
        struct in_ifaddr *in;
-       __u32 *mask_out = m;
+       __be32 *mask_out = m;
 
        if(ip == NULL) 
                return(1);