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

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

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/ppp_generic.c linux/drivers/net/ppp_generic.c
@@ -92,7 +92,6 @@
  */
 struct ppp {
 	struct ppp_file	file;		/* stuff for read/write/poll */
-	char		name[16];	/* unit name */
 	struct list_head channels;	/* list of attached channels */
 	int		n_channels;	/* how many channels are attached */
 	spinlock_t	rlock;		/* lock for receive side */
@@ -2190,7 +2189,6 @@
 	memset(dev, 0, sizeof(struct net_device));
 
 	ppp->file.index = unit;
-	sprintf(ppp->name, "ppp%d", unit);
 	ppp->mru = PPP_MRU;
 	init_ppp_file(&ppp->file, INTERFACE);
 	for (i = 0; i < NUM_NP; ++i)
@@ -2205,7 +2203,7 @@
 
 	ppp->dev = dev;
 	dev->init = ppp_net_init;
-	dev->name = ppp->name;
+	sprintf(dev->name, "ppp%d", unit);
 	dev->priv = ppp;
 	dev->new_style = 1;
 

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