patch-2.3.99-pre7 linux/drivers/net/smc-mca.c

• Lines: 24
• Date: Tue May 2 12:41:00 2000
• Orig file: v2.3.99-pre6/linux/drivers/net/smc-mca.c
• Orig date: Sun Feb 13 19:29:04 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/smc-mca.c linux/drivers/net/smc-mca.c
@@ -437,14 +437,11 @@
 #undef MODULE        /* don't want to bother now! */
 
 #define MAX_ULTRAMCA_CARDS 4	/* Max number of Ultra cards per module */
-#define NAMELEN 8		/* # of chars for storing dev->name */
-
-static char namelist[NAMELEN * MAX_ULTRAMCA_CARDS] = { 0, };
 
 static struct net_device dev_ultra[MAX_ULTRAMCA_CARDS] =
 {
 	{
-		NULL,       /* assign a chunk of namelist[] below */
+		"",
 	        0, 0, 0, 0,
 	        0, 0,
 	        0, 0, 0, NULL, NULL
@@ -463,7 +460,6 @@
 
 	for (this_dev = 0; this_dev < MAX_ULTRAMCA_CARDS; this_dev++) {
 		struct net_device *dev = &dev_ultra[this_dev];
-		dev->name = namelist + (NAMELEN * this_dev);
 		dev->irq = irq[this_dev];
 		dev->base_addr = io[this_dev];
 		dev->init = ultramca_probe;