1 files changed, 8 insertions, 3 deletions

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index a492e59883a3..d2996183e584 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -293,7 +293,7 @@ static void uml_net_user_timer_expire(unsigned long _conn)
 #endif
 }
 
-static void setup_etheraddr(char *str, unsigned char *addr, char *name)
+static int setup_etheraddr(char *str, unsigned char *addr, char *name)
 {
         char *end;
         int i;
@@ -334,12 +334,13 @@ static void setup_etheraddr(char *str, unsigned char *addr, char *name)
                        addr[0] | 0x02, addr[1], addr[2], addr[3], addr[4],
                        addr[5]);
         }
-        return;
+        return 0;
 
 random:
         printk(KERN_INFO
                "Choosing a random ethernet address for device %s\n", name);
         random_ether_addr(addr);
+        return 1;
 }
 
 static DEFINE_SPINLOCK(devices_lock);
@@ -391,6 +392,7 @@ static void eth_configure(int n, void *init, char *mac,
         struct net_device *dev;
         struct uml_net_private *lp;
         int err, size;
+        int random_mac;
 
         size = transport->private_size + sizeof(struct uml_net_private);
 
@@ -417,7 +419,7 @@ static void eth_configure(int n, void *init, char *mac,
          */
         snprintf(dev->name, sizeof(dev->name), "eth%d", n);
 
-        setup_etheraddr(mac, device->mac, dev->name);
+        random_mac = setup_etheraddr(mac, device->mac, dev->name);
 
         printk(KERN_INFO "Netdevice %d (%pM) : ", n, device->mac);
 
@@ -474,6 +476,9 @@ static void eth_configure(int n, void *init, char *mac,
 
         /* don't use eth_mac_addr, it will not work here */
         memcpy(dev->dev_addr, device->mac, ETH_ALEN);
+        if (random_mac)
+                dev->addr_assign_type |= NET_ADDR_RANDOM;
+
         dev->mtu = transport->user->mtu;
         dev->netdev_ops = &uml_netdev_ops;
         dev->ethtool_ops = &uml_net_ethtool_ops;