patch-2.4.10 linux/net/irda/irlap_event.c

• Lines: 19
• Date: Thu Sep 13 16:26:52 2001
• Orig file: v2.4.9/linux/net/irda/irlap_event.c
• Orig date: Wed Jul 25 17:10:27 2001

diff -u --recursive --new-file v2.4.9/linux/net/irda/irlap_event.c linux/net/irda/irlap_event.c
@@ -2018,7 +2018,7 @@
 {
 	int ret = 0;
 
-	IRDA_DEBUG(0, __FUNCTION__ "()\n");
+	IRDA_DEBUG(1, __FUNCTION__ "()\n");
 
 	ASSERT(self != NULL, return -ENODEV;);
 	ASSERT(self->magic == LAP_MAGIC, return -EBADR;);
@@ -2048,6 +2048,9 @@
 		irlap_disconnect_indication(self, LAP_DISC_INDICATION);
 		break;
 	case WD_TIMER_EXPIRED:
+		/* Always switch state before calling upper layers */
+		irlap_next_state(self, LAP_NDM);
+
 		irlap_apply_default_connection_parameters(self);
 		
 		irlap_disconnect_indication(self, LAP_DISC_INDICATION);