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

• Lines: 21
• Date: Tue May 2 12:41:00 2000
• Orig file: v2.3.99-pre6/linux/drivers/net/wd.c
• Orig date: Mon Nov 1 13:56:26 1999

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/wd.c linux/drivers/net/wd.c
@@ -442,11 +442,9 @@
 
 #ifdef MODULE
 #define MAX_WD_CARDS	4	/* Max number of wd cards per module */
-#define NAMELEN		8	/* # of chars for storing dev->name */
-static char namelist[NAMELEN * MAX_WD_CARDS] = { 0, };
 static struct net_device dev_wd[MAX_WD_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
@@ -472,7 +470,6 @@
 
 	for (this_dev = 0; this_dev < MAX_WD_CARDS; this_dev++) {
 		struct net_device *dev = &dev_wd[this_dev];
-		dev->name = namelist+(NAMELEN*this_dev);
 		dev->irq = irq[this_dev];
 		dev->base_addr = io[this_dev];
 		dev->mem_start = mem[this_dev];