1 files changed, 10 insertions, 6 deletions

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 3c6c44ca1ffa..1e8f41a99511 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -318,7 +318,7 @@ static void setup_etheraddr(char *str, unsigned char *addr, char *name)
         if (str == NULL)
                 goto random;
 
-        for (i = 0;i < 6; i++) {
+        for (i = 0; i < 6; i++) {
                 addr[i] = simple_strtoul(str, &end, 16);
                 if ((end == str) ||
                    ((*end != ':') && (*end != ',') && (*end != '\0'))) {
@@ -343,14 +343,13 @@ static void setup_etheraddr(char *str, unsigned char *addr, char *name)
         }
         if (!is_local_ether_addr(addr)) {
                 printk(KERN_WARNING
-                       "Warning: attempt to assign a globally valid ethernet "
+                       "Warning: Assigning a globally valid ethernet "
                        "address to a device\n");
-                printk(KERN_WARNING "You should better enable the 2nd "
-                       "rightmost bit in the first byte of the MAC,\n");
+                printk(KERN_WARNING "You should set the 2nd rightmost bit in "
+                       "the first byte of the MAC,\n");
                 printk(KERN_WARNING "i.e. %02x:%02x:%02x:%02x:%02x:%02x\n",
                        addr[0] | 0x02, addr[1], addr[2], addr[3], addr[4],
                        addr[5]);
-                goto random;
         }
         return;
 
@@ -368,7 +367,6 @@ static struct platform_driver uml_net_driver = {
                 .name  = DRIVER_NAME,
         },
 };
-static int driver_registered;
 
 static void net_device_release(struct device *dev)
 {
@@ -383,6 +381,12 @@ static void net_device_release(struct device *dev)
         free_netdev(netdev);
 }
 
+/*
+ * Ensures that platform_driver_register is called only once by
+ * eth_configure.  Will be set in an initcall.
+ */
+static int driver_registered;
+
 static void eth_configure(int n, void *init, char *mac,
                           struct transport *transport)
 {