[LV-kern-commit] CVS: kernel-2.4/net/irda/irlan irlan_common.c,1.1.1.1,1.2 irlan_provider.c,1.1.1.1,1.2

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/net/irda/irlan
In directory usw-pr-cvs1:/tmp/cvs-serv31773/irda/irlan

Modified Files:
	irlan_common.c irlan_provider.c 
Log Message:
synch 2.4.15 commit 20


Index: irlan_common.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/net/irda/irlan/irlan_common.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- irlan_common.c	14 Jan 2001 17:16:37 -0000	1.1.1.1
+++ irlan_common.c	9 Apr 2002 16:26:57 -0000	1.2
@@ -209,6 +209,7 @@
 	struct irlan_cb *self;
 
 	IRDA_DEBUG(2, __FUNCTION__ "()\n");
+	ASSERT(irlan != NULL, return NULL;);
 
 	/* 
 	 *  Initialize the irlan structure. 
@@ -224,8 +225,6 @@
 	 */
 	self->magic = IRLAN_MAGIC;
 
-	ASSERT(irlan != NULL, return NULL;);
-	
 	sprintf(self->dev.name, "%s", "unknown");
 
 	self->dev.priv = (void *) self;
@@ -1074,19 +1073,18 @@
 {
  	struct irlan_cb *self;
 	unsigned long flags;
+	ASSERT(irlan != NULL, return 0;);
      
 	save_flags(flags);
 	cli();
 
-	ASSERT(irlan != NULL, return 0;);
-	
 	len = 0;
 	
 	len += sprintf(buf+len, "IrLAN instances:\n");
 	
 	self = (struct irlan_cb *) hashbin_get_first(irlan);
 	while (self != NULL) {
-		ASSERT(self->magic == IRLAN_MAGIC, return len;);
+		ASSERT(self->magic == IRLAN_MAGIC, break;);
 		
 		len += sprintf(buf+len, "ifname: %s,\n",
 			       self->dev.name);
@@ -1186,6 +1184,7 @@
 
 MODULE_AUTHOR("Dag Brattli <da...@cs...>");
 MODULE_DESCRIPTION("The Linux IrDA LAN protocol"); 
+MODULE_LICENSE("GPL");
 
 MODULE_PARM(eth, "i");
 MODULE_PARM_DESC(eth, "Name devices ethX (0) or irlanX (1)");

Index: irlan_provider.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/net/irda/irlan/irlan_provider.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- irlan_provider.c	14 Jan 2001 17:16:41 -0000	1.1.1.1
+++ irlan_provider.c	9 Apr 2002 16:26:57 -0000	1.2
@@ -162,7 +162,7 @@
 /*
  * Function irlan_provider_connect_response (handle)
  *
- *    Accept incomming connection
+ *    Accept incoming connection
  *
  */
 void irlan_provider_connect_response(struct irlan_cb *self,
@@ -371,7 +371,7 @@
 /*
  * Function irlan_provider_register(void)
  *
- *    Register provider support so we can accept incomming connections.
+ *    Register provider support so we can accept incoming connections.
  * 
  */
 int irlan_provider_open_ctrl_tsap(struct irlan_cb *self)