patch-2.4.4 linux/drivers/net/net_init.c

Next file: linux/drivers/net/ni5010.c
Previous file: linux/drivers/net/ne2k-pci.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.3/linux/drivers/net/net_init.c linux/drivers/net/net_init.c
@@ -171,16 +171,16 @@
 	return dev;
 }
 
+#if defined(CONFIG_HIPPI) || defined(CONFIG_TR) || defined(CONFIG_NET_FC)
 static int __register_netdev(struct net_device *dev)
 {
-	dev_init_buffers(dev);
-	
 	if (dev->init && dev->init(dev) != 0) {
 		unregister_netdev(dev);
 		return -EIO;
 	}
 	return 0;
 }
+#endif
 
 /**
  * init_etherdev - Register ethernet device
@@ -416,8 +416,6 @@
 
 	/* New-style flags. */
 	dev->flags		= IFF_BROADCAST|IFF_MULTICAST;
-
-	dev_init_buffers(dev);
 }
 EXPORT_SYMBOL(ether_setup);
 
@@ -444,10 +442,6 @@
 
 	/* New-style flags */
 	dev->flags		= IFF_BROADCAST | IFF_MULTICAST;
-
-	dev_init_buffers(dev);
-	
-	return;
 }
 EXPORT_SYMBOL(fddi_setup);
 
@@ -484,8 +478,6 @@
 	 * static ARP tables. ARP is disabled by hippi_neigh_setup_dev. 
 	 */
 	dev->flags = 0; 
-
-	dev_init_buffers(dev);
 }
 EXPORT_SYMBOL(hippi_setup);
 #endif /* CONFIG_HIPPI */
@@ -523,8 +515,6 @@
 	dev->broadcast[0]	= 0xFF;
 
 	dev->flags		= IFF_BROADCAST|IFF_MULTICAST|IFF_NOARP;
-
-	dev_init_buffers(dev);
 }
 EXPORT_SYMBOL(ltalk_setup);
 
@@ -674,7 +664,6 @@
 
         /* New-style flags. */
         dev->flags              =        IFF_BROADCAST;
-	dev_init_buffers(dev);
 }
 
 /**

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)