patch-2.3.99-pre7 linux/drivers/net/3c523.c

Next file: linux/drivers/net/3c527.c
Previous file: linux/drivers/net/3c515.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/3c523.c linux/drivers/net/3c523.c
@@ -1207,15 +1207,11 @@
 
 /* Increase if needed ;) */
 #define MAX_3C523_CARDS 4
-/* I'm not sure where this magic 9 comes from */
-#define NAMELEN 9
-
-static char devicenames[NAMELEN * MAX_3C523_CARDS] = {0,};
 
 static struct net_device dev_elmc[MAX_3C523_CARDS] =
 {	
 	{
-	NULL /*"3c523" */ , 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL
+	"", 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL
 	},
 };
 
@@ -1232,7 +1228,6 @@
 	for(this_dev=0; this_dev<MAX_3C523_CARDS; this_dev++) 
 		{
 		struct net_device *dev = &dev_elmc[this_dev];
-		dev->name=devicenames+(NAMELEN*this_dev);
 		dev->irq=irq[this_dev];
 		dev->base_addr=io[this_dev];
 		dev->init=elmc_probe;

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