4 files changed, 15 insertions, 22 deletions

diff --git a/arch/um/Kconfig.net b/arch/um/Kconfig.net
index 3160b1a5adb7..820a56f00332 100644
--- a/arch/um/Kconfig.net
+++ b/arch/um/Kconfig.net
@@ -157,7 +157,7 @@ config UML_NET_MCAST
 
 config UML_NET_PCAP
         bool "pcap transport"
-        depends on UML_NET && EXPERIMENTAL
+        depends on UML_NET
         help
         The pcap transport makes a pcap packet stream on the host look
         like an ethernet device inside UML.  This is useful for making
diff --git a/arch/um/Kconfig.um b/arch/um/Kconfig.um
index bf87f25eb2de..a7520c90f62d 100644
--- a/arch/um/Kconfig.um
+++ b/arch/um/Kconfig.um
@@ -45,8 +45,8 @@ config HOSTFS
           say Y or M here; otherwise say N.
 
 config HPPFS
-        tristate "HoneyPot ProcFS (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && PROC_FS
+        tristate "HoneyPot ProcFS"
+        depends on PROC_FS
         help
           hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc
           entries to be overridden, removed, or fabricated from the host.
@@ -96,7 +96,7 @@ config MAGIC_SYSRQ
           unless you really know what this hack does.
 
 config SMP
-        bool "Symmetric multi-processing support (EXPERIMENTAL)"
+        bool "Symmetric multi-processing support"
         default n
         depends on BROKEN
         help
@@ -126,7 +126,7 @@ config NR_CPUS
         default "32"
 
 config HIGHMEM
-        bool "Highmem support (EXPERIMENTAL)"
+        bool "Highmem support"
         depends on !64BIT && BROKEN
         default n
         help
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index b1314ebf1f72..d8926c303629 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -274,8 +274,8 @@ static void uml_net_poll_controller(struct net_device *dev)
 static void uml_net_get_drvinfo(struct net_device *dev,
                                 struct ethtool_drvinfo *info)
 {
-        strcpy(info->driver, DRIVER_NAME);
-        strcpy(info->version, "42");
+        strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver));
+        strlcpy(info->version, "42", sizeof(info->version));
 }
 
 static const struct ethtool_ops uml_net_ethtool_ops = {
@@ -293,8 +293,9 @@ static void uml_net_user_timer_expire(unsigned long _conn)
 #endif
 }
 
-static int setup_etheraddr(char *str, unsigned char *addr, char *name)
+static void setup_etheraddr(struct net_device *dev, char *str)
 {
+        unsigned char *addr = dev->dev_addr;
         char *end;
         int i;
 
@@ -334,13 +335,12 @@ static int setup_etheraddr(char *str, unsigned char *addr, char *name)
                        addr[0] | 0x02, addr[1], addr[2], addr[3], addr[4],
                        addr[5]);
         }
-        return 0;
+        return;
 
 random:
         printk(KERN_INFO
-               "Choosing a random ethernet address for device %s\n", name);
-        eth_random_addr(addr);
-        return 1;
+               "Choosing a random ethernet address for device %s\n", dev->name);
+        eth_hw_addr_random(dev);
 }
 
 static DEFINE_SPINLOCK(devices_lock);
@@ -392,7 +392,6 @@ 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);
 
@@ -419,9 +418,9 @@ static void eth_configure(int n, void *init, char *mac,
          */
         snprintf(dev->name, sizeof(dev->name), "eth%d", n);
 
-        random_mac = setup_etheraddr(mac, device->mac, dev->name);
+        setup_etheraddr(dev, mac);
 
-        printk(KERN_INFO "Netdevice %d (%pM) : ", n, device->mac);
+        printk(KERN_INFO "Netdevice %d (%pM) : ", n, dev->dev_addr);
 
         lp = netdev_priv(dev);
         /* This points to the transport private data. It's still clear, but we
@@ -468,17 +467,12 @@ static void eth_configure(int n, void *init, char *mac,
         init_timer(&lp->tl);
         spin_lock_init(&lp->lock);
         lp->tl.function = uml_net_user_timer_expire;
-        memcpy(lp->mac, device->mac, sizeof(lp->mac));
+        memcpy(lp->mac, dev->dev_addr, sizeof(lp->mac));
 
         if ((transport->user->init != NULL) &&
             ((*transport->user->init)(&lp->user, dev) != 0))
                 goto out_unregister;
 
-        /* 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;
diff --git a/arch/um/include/shared/net_kern.h b/arch/um/include/shared/net_kern.h
index 5c367f22595b..012ac87d4900 100644
--- a/arch/um/include/shared/net_kern.h
+++ b/arch/um/include/shared/net_kern.h
@@ -18,7 +18,6 @@ struct uml_net {
         struct net_device *dev;
         struct platform_device pdev;
         int index;
-        unsigned char mac[ETH_ALEN];
 };
 
 struct uml_net_private {