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

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

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/eth16i.c linux/drivers/net/eth16i.c
@@ -1390,12 +1390,10 @@
 }
 
 #define MAX_ETH16I_CARDS 4  /* Max number of Eth16i cards per module */
-#define NAMELEN          8  /* number of chars for storing dev->name */
 
-static char namelist[NAMELEN * MAX_ETH16I_CARDS] = { 0, };
 static struct net_device dev_eth16i[MAX_ETH16I_CARDS] = {
 	{
-		NULL,
+		"",
 		0, 0, 0, 0,
 		0, 0,
 		0, 0, 0, NULL, NULL
@@ -1436,7 +1434,6 @@
 	{
 		struct net_device *dev = &dev_eth16i[this_dev];
 	
-		dev->name = namelist + (NAMELEN*this_dev);
 		dev->irq = 0; /* irq[this_dev]; */
 		dev->base_addr = io[this_dev];
 		dev->init = eth16i_probe;

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