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

Next file: linux/drivers/net/hamradio/scc.c
Previous file: linux/drivers/net/hamradio/hdlcdrv.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/hamradio/mkiss.c linux/drivers/net/hamradio/mkiss.c
@@ -73,7 +73,6 @@
 };
 
 typedef struct ax25_ctrl {
-	char if_name[8];	/* "ax0\0" .. "ax99999\0"	*/
 	struct ax_disp ctrl;	/* 				*/
 	struct net_device  dev;	/* the device			*/
 } ax25_ctrl_t;
@@ -200,9 +199,8 @@
 
 		/* Initialize channel control data */
 		set_bit(AXF_INUSE, &axp->ctrl.flags);
-		sprintf(axp->if_name, "ax%d", i++);
+		sprintf(axp->dev.name, "ax%d", i++);
 		axp->ctrl.tty      = NULL;
-		axp->dev.name      = axp->if_name;
 		axp->dev.base_addr = i;
 		axp->dev.priv      = (void *)&axp->ctrl;
 		axp->dev.next      = NULL;

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