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

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

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/ethertap.c linux/drivers/net/ethertap.c
@@ -339,11 +339,9 @@
 static int unit;
 MODULE_PARM(unit,"i");
 
-static char devicename[9] = { 0, };
-
 static struct net_device dev_ethertap =
 {
-	devicename,
+	" ",
 	0, 0, 0, 0,
 	1, 5,
 	0, 0, 0, NULL, ethertap_probe
@@ -352,10 +350,10 @@
 int init_module(void)
 {
 	dev_ethertap.base_addr=unit+NETLINK_TAPBASE;
-	sprintf(devicename,"tap%d",unit);
-	if (dev_get(devicename))
+	sprintf(dev_ethertap.name,"tap%d",unit);
+	if (dev_get(dev_ethertap.name))
 	{
-		printk(KERN_INFO "%s already loaded.\n", devicename);
+		printk(KERN_INFO "%s already loaded.\n", dev_ethertap.name);
 		return -EBUSY;
 	}
 	if (register_netdev(&dev_ethertap) != 0)

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