patch-2.4.0-test2 linux/drivers/net/net_init.c

• Lines: 25
• Date: Tue Jun 20 14:32:27 2000
• Orig file: v2.4.0-test1/linux/drivers/net/net_init.c
• Orig date: Thu May 11 15:30:07 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/net/net_init.c linux/drivers/net/net_init.c
@@ -115,14 +115,17 @@
 	 *	Allocate a name
 	 */
 	 
-	if (dev->name[0] == '\0' || dev->name[0] == ' ')
-	{
-		if(dev_alloc_name(dev, mask)<0)
-		{
-			if(new_device)
-				kfree(dev);
-			return NULL;
+	if (dev->name[0] == '\0' || dev->name[0] == ' ') {
+		strcpy(dev->name, mask);
+		if (!netdev_boot_setup_check(dev)) {
+			if (dev_alloc_name(dev, mask)<0) {
+				if (new_device)
+					kfree(dev);
+				return NULL;
+			}
 		}
+	} else {
+		netdev_boot_setup_check(dev);
 	}
 	
 	/*