uml: fix previous request size limit fix

[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 baac4ad5e68eda7916ead4c014e5872226e803fd..d35d0c1ee7f4d700ac17fd2fda5a653e28d1ae37 100644 (file)
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -316,12 +316,14 @@ 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 address to a "
-                      "device\n");
-               printk(KERN_WARNING "You should better enable the 2nd rightmost bit "
-                     "in the first byte of the MAC, i.e. "
-                     "%02x:%02x:%02x:%02x:%02x:%02x\n",
-                     addr[0] | 0x02, addr[1], addr[2], addr[3], addr[4], addr[5]);
+                      "Warning: attempt to assign 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 "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;
 
@@ -478,6 +480,7 @@ out_undo_user_init:
                (*transport->user->remove)(&lp->user);
 out_unregister:
        platform_device_unregister(&device->pdev);
+       return; /* platform_device_unregister frees dev and device */
 out_free_netdev:
        free_netdev(dev);
 out_free_device:
@@ -620,7 +623,7 @@ static int eth_setup_common(char *str, int index)
        return found;
 }
 
-static int eth_setup(char *str)
+static int __init eth_setup(char *str)
 {
        struct eth_init *new;
        char *error;