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

• Lines: 98
• Date: Tue Sep 19 08:31:43 2000
• Orig file: v2.4.0-test8/linux/drivers/net/net_init.c
• Orig date: Fri Jul 14 14:46:30 2000

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/net/net_init.c linux/drivers/net/net_init.c
@@ -96,7 +96,8 @@
  *	setup.
  */
 
-static struct net_device *init_netdev(struct net_device *dev, int sizeof_priv, char *mask, void (*setup)(struct net_device *))
+static struct net_device *init_netdev(struct net_device *dev, int sizeof_priv,
+				      char *mask, void (*setup)(struct net_device *))
 {
 	int new_device = 0;
 
@@ -117,16 +118,14 @@
 	 
 	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;
-			}
+		if (dev_alloc_name(dev, mask)<0) {
+			if (new_device)
+				kfree(dev);
+			return NULL;
 		}
-	} else {
-		netdev_boot_setup_check(dev);
 	}
+
+	netdev_boot_setup_check(dev);
 	
 	/*
 	 *	Configure via the caller provided setup function then
@@ -198,7 +197,7 @@
 	return(0);
 }
 
-#endif
+#endif /* CONFIG_FDDI */
 
 #ifdef CONFIG_HIPPI
 
@@ -256,7 +255,7 @@
 	return 0;
 }
 
-#endif
+#endif /* CONFIG_HIPPI */
 
 void ether_setup(struct net_device *dev)
 {
@@ -314,7 +313,7 @@
 	return;
 }
 
-#endif
+#endif /* CONFIG_FDDI */
 
 #ifdef CONFIG_HIPPI
 void hippi_setup(struct net_device *dev)
@@ -350,7 +349,7 @@
 
 	dev_init_buffers(dev);
 }
-#endif
+#endif /* CONFIG_HIPPI */
 
 #if defined(CONFIG_ATALK) || defined(CONFIG_ATALK_MODULE)
 
@@ -389,7 +388,7 @@
 	dev_init_buffers(dev);
 }
 
-#endif
+#endif /* CONFIG_ATALK || CONFIG_ATALK_MODULE */
 
 int ether_config(struct net_device *dev, struct ifmap *map)
 {
@@ -506,7 +505,7 @@
 	unregister_netdevice(dev);
 	rtnl_unlock();
 }
-#endif
+#endif /* CONFIG_TR */
 
 
 #ifdef CONFIG_NET_FC
@@ -555,10 +554,3 @@
 
 #endif /* CONFIG_NET_FC */
 
-/*
- * Local variables:
- *  compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/net/inet -Wall -Wstrict-prototypes -O6 -m486 -c net_init.c"
- *  version-control: t
- *  kept-new-versions: 5
- * End:
- */