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

• Lines: 21
• Date: Tue May 2 12:41:00 2000
• Orig file: v2.3.99-pre6/linux/drivers/net/smc-ultra.c
• Orig date: Sat Feb 12 11:22:10 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/smc-ultra.c linux/drivers/net/smc-ultra.c
@@ -424,11 +424,9 @@
 
 #ifdef MODULE
 #define MAX_ULTRA_CARDS	4	/* Max number of Ultra cards per module */
-#define NAMELEN		8	/* # of chars for storing dev->name */
-static char namelist[NAMELEN * MAX_ULTRA_CARDS] = { 0, };
 static struct net_device dev_ultra[MAX_ULTRA_CARDS] = {
 	{
-		NULL,		/* assign a chunk of namelist[] below */
+		"",		/* assign a chunk of namelist[] below */
 		0, 0, 0, 0,
 		0, 0,
 		0, 0, 0, NULL, NULL
@@ -452,7 +450,6 @@
 
 	for (this_dev = 0; this_dev < MAX_ULTRA_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 = ultra_probe;