patch-2.3.99-pre7 linux/net/irda/irlan/irlan_common.c

• Lines: 40
• Date: Thu May 4 11:31:22 2000
• Orig file: v2.3.99-pre6/linux/net/irda/irlan/irlan_common.c
• Orig date: Sun Feb 20 21:12:40 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/net/irda/irlan/irlan_common.c linux/net/irda/irlan/irlan_common.c
@@ -124,7 +124,7 @@
 		IRDA_DEBUG(0, __FUNCTION__ 
 		      "(), notifying irmanager to stop irlan!\n");
 		mgr_event.event = EVENT_IRLAN_STOP;
-		sprintf(mgr_event.devname, "%s", self->ifname);
+		sprintf(mgr_event.devname, "%s", self->dev.name);
 		irmanager_notify(&mgr_event);
 
 		/*
@@ -234,10 +234,9 @@
 	if (!eth) {
 		/* Get the first free irlan<x> name */
 		do {
-			sprintf(self->ifname, "%s%d", "irlan", i++);
-		} while (dev_get(self->ifname));
+			sprintf(self->dev.name, "%s%d", "irlan", i++);
+		} while (dev_get(self->dev.name));
 	}
-	self->dev.name = self->ifname;
 	
 	if (register_netdev(&self->dev) != 0) {
 		IRDA_DEBUG(2, __FUNCTION__ "(), register_netdev() failed!\n");
@@ -276,7 +275,7 @@
 
 	ASSERT(irlan != NULL, return NULL;);
 	
-	sprintf(self->ifname, "%s", "unknown");
+	sprintf(self->dev.name, "%s", "unknown");
 
 	self->dev.priv = (void *) self;
 	self->dev.next = NULL;
@@ -1173,7 +1172,7 @@
 		/* Don't display the master server */
 		if (self->master == 0) {
 			len += sprintf(buf+len, "ifname: %s,\n",
-				       self->ifname);
+				       self->dev.name);
 			len += sprintf(buf+len, "client state: %s, ",
 				       irlan_state[ self->client.state]);
 			len += sprintf(buf+len, "provider state: %s,\n",