patch-2.3.99-pre7 linux/drivers/net/hamradio/yam.c

• Lines: 34
• Date: Thu May 4 11:31:21 2000
• Orig file: v2.3.99-pre6/linux/drivers/net/hamradio/yam.c
• Orig date: Tue Mar 14 19:10:39 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/hamradio/yam.c linux/drivers/net/hamradio/yam.c
@@ -116,7 +116,6 @@
 	int iobase;
 	int irq;
 	int dupmode;
-	char name[16];
 
 	struct net_device dev;
 
@@ -793,7 +792,7 @@
 	for (i = 0; i < NR_PORTS; i++) {
 		if (yam_ports[i].iobase == 0 || yam_ports[i].irq == 0)
 			continue;
-		len += sprintf(buffer + len, "Device %s\n", yam_ports[i].name);
+		len += sprintf(buffer + len, "Device yam%d\n", i);
 		len += sprintf(buffer + len, "  Up       %d\n", netif_running(&yam_ports[i].dev));
 		len += sprintf(buffer + len, "  Speed    %u\n", yam_ports[i].bitrate);
 		len += sprintf(buffer + len, "  IoBase   0x%x\n", yam_ports[i].iobase);
@@ -1148,7 +1147,7 @@
 	memset(yam_ports, 0, sizeof(yam_ports));
 
 	for (i = 0; i < NR_PORTS; i++) {
-		sprintf(yam_ports[i].name, "yam%d", i);
+		sprintf(yam_ports[i].dev.name, "yam%d", i);
 		yam_ports[i].magic = YAM_MAGIC;
 		yam_ports[i].bitrate = DEFAULT_BITRATE;
 		yam_ports[i].baudrate = DEFAULT_BITRATE * 2;
@@ -1164,7 +1163,6 @@
 		dev = &yam_ports[i].dev;
 
 		dev->priv = &yam_ports[i];
-		dev->name = yam_ports[i].name;
 		dev->base_addr = yam_ports[i].iobase;
 		dev->irq = yam_ports[i].irq;
 		dev->init = yam_probe;