patch-2.3.99-pre7 linux/drivers/net/eexpress.c

Next file: linux/drivers/net/epic100.c
Previous file: linux/drivers/net/eepro100.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/eexpress.c linux/drivers/net/eexpress.c
@@ -1623,13 +1623,10 @@
 #ifdef MODULE
 
 #define EEXP_MAX_CARDS     4    /* max number of cards to support */
-#define NAMELEN            8    /* max length of dev->name (inc null) */
-
-static char namelist[NAMELEN * EEXP_MAX_CARDS] = { 0, };
 
 static struct net_device dev_eexp[EEXP_MAX_CARDS] =
 {
-        { NULL,         /* will allocate dynamically */
+        { "",
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, express_probe },
 };
 
@@ -1649,7 +1646,6 @@
 
 	for (this_dev = 0; this_dev < EEXP_MAX_CARDS; this_dev++) {
 		struct net_device *dev = &dev_eexp[this_dev];
-		dev->name = namelist + (NAMELEN*this_dev);
 		dev->irq = irq[this_dev];
 		dev->base_addr = io[this_dev];
 		if (io[this_dev] == 0) {

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