patch-2.4.0-test11 linux/net/irda/iriap.c

• Lines: 55
• Date: Sat Nov 11 18:11:22 2000
• Orig file: v2.4.0-test10/linux/net/irda/iriap.c
• Orig date: Thu Jan 6 14:46:18 2000

diff -u --recursive --new-file v2.4.0-test10/linux/net/irda/iriap.c linux/net/irda/iriap.c
@@ -107,7 +107,7 @@
 
 	/* Register the Device object with LM-IAS */
 	obj = irias_new_object("Device", IAS_DEVICE_ID);
-	irias_add_string_attrib(obj, "DeviceName", "Linux");
+	irias_add_string_attrib(obj, "DeviceName", "Linux", IAS_KERNEL_ATTR);
 
 	oct_seq[0] = 0x01;  /* Version 1 */
 	oct_seq[1] = 0x00;  /* IAS support bits */
@@ -115,7 +115,8 @@
 #ifdef CONFIG_IRDA_ULTRA
 	oct_seq[2] |= 0x04; /* Connectionless Data support */
 #endif
-	irias_add_octseq_attrib(obj, "IrLMPSupport", oct_seq, 3);
+	irias_add_octseq_attrib(obj, "IrLMPSupport", oct_seq, 3,
+				IAS_KERNEL_ATTR);
 	irias_insert_object(obj);
 
 	/*  
@@ -179,7 +180,7 @@
 
 	init_timer(&self->watchdog_timer);
 
-	hashbin_insert(iriap, (queue_t *) self, (int) self, NULL);
+	hashbin_insert(iriap, (irda_queue_t *) self, (int) self, NULL);
 	
 	/* Initialize state machines */
 	iriap_next_client_state(self, S_DISCONNECT);
@@ -866,7 +867,7 @@
 			iriap_getvaluebyclass_confirm(self, skb);
 			break;
 		case IAS_CLASS_UNKNOWN:
-			WARNING(__FUNCTION__ "(), No such class!\n");
+			IRDA_DEBUG(1, __FUNCTION__ "(), No such class!\n");
 			/* Finished, close connection! */
 			iriap_disconnect_request(self);
 
@@ -880,7 +881,7 @@
 			dev_kfree_skb(skb);
 			break;
 		case IAS_ATTRIB_UNKNOWN:
-			WARNING(__FUNCTION__ "(), No such attribute!\n");
+			IRDA_DEBUG(1, __FUNCTION__ "(), No such attribute!\n");
 		       	/* Finished, close connection! */
 			iriap_disconnect_request(self);
 
@@ -889,7 +890,7 @@
 			 * no to use self anymore after calling confirm 
 			 */
 			if (self->confirm)
-				self->confirm(IAS_CLASS_UNKNOWN, 0, NULL, 
+				self->confirm(IAS_ATTRIB_UNKNOWN, 0, NULL, 
 					      self->priv);
 			dev_kfree_skb(skb);
 			break;