patch-2.3.99-pre7 linux/drivers/net/wan/x25_asy.c

Next file: linux/drivers/net/wavelan.c
Previous file: linux/drivers/net/wan/sealevel.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/wan/x25_asy.c linux/drivers/net/wan/x25_asy.c
@@ -32,7 +32,6 @@
 #include "x25_asy.h"
 
 typedef struct x25_ctrl {
-	char		if_name[8];	/* "xasy0\0" .. "xasy99999\0"	*/
 	struct x25_asy	ctrl;		/* X.25 things			*/
 	struct net_device	dev;		/* the device			*/
 } x25_asy_ctrl_t;
@@ -82,8 +81,7 @@
 		/* Initialize channel control data */
 		set_bit(SLF_INUSE, &slp->ctrl.flags);
 		slp->ctrl.tty         = NULL;
-		sprintf(slp->if_name, "x25asy%d", i);
-		slp->dev.name         = slp->if_name;
+		sprintf(slp->dev.name, "x25asy%d", i);
 		slp->dev.base_addr    = i;
 		slp->dev.priv         = (void*)&(slp->ctrl);
 		slp->dev.next         = NULL;

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