patch-2.3.99-pre7 linux/drivers/net/hamradio/6pack.c

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

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/hamradio/6pack.c linux/drivers/net/hamradio/6pack.c
@@ -51,7 +51,6 @@
 
 
 typedef struct sixpack_ctrl {
-	char		if_name[8];	/* "sp0\0" .. "sp99999\0"	*/
 	struct sixpack	ctrl;		/* 6pack things			*/
 	struct net_device	dev;		/* the device			*/
 } sixpack_ctrl_t;
@@ -107,8 +106,7 @@
 		/* Initialize channel control data */
 		set_bit(SIXPF_INUSE, &spp->ctrl.flags);
 		spp->ctrl.tty         = NULL;
-		sprintf(spp->if_name, "sp%d", i);
-		spp->dev.name         = spp->if_name;
+		sprintf(spp->dev.name, "sp%d", i);
 		spp->dev.base_addr    = i;
 		spp->dev.priv         = (void*)&(spp->ctrl);
 		spp->dev.next         = NULL;

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