From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Thu, 10 Oct 2002 20:13:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Thu, 10 Oct 2002 20:13:04 -0400 Received: from deimos.hpl.hp.com ([192.6.19.190]:48858 "EHLO deimos.hpl.hp.com") by vger.kernel.org with ESMTP id ; Thu, 10 Oct 2002 20:11:57 -0400 Date: Thu, 10 Oct 2002 17:17:42 -0700 To: irda-users@lists.sourceforge.net, Jeff Garzik , Linux kernel mailing list Subject: [PATCH 2.5] : ir251_lmp_timer_race-2.diff Message-ID: <20021011001742.GG6645@bougret.hpl.hp.com> Reply-To: jt@hpl.hp.com Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.3.28i Organisation: HP Labs Palo Alto Address: HP Labs, 1U-17, 1501 Page Mill road, Palo Alto, CA 94304, USA. E-mail: jt@hpl.hp.com From: Jean Tourrilhes Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org ir251_lmp_timer_race-2.diff : --------------------------- o [CORRECT] Start timer before sending event to fix race condition o [FEATURE] Improve the IrLMP event debugging messages. diff -u -p linux/net/irda/irlmp_event.d3.c linux/net/irda/irlmp_event.c --- linux/net/irda/irlmp_event.d3.c Thu Oct 10 15:25:48 2002 +++ linux/net/irda/irlmp_event.c Thu Oct 10 15:31:09 2002 @@ -514,10 +514,10 @@ static int irlmp_state_disconnected(stru irlmp_next_lsap_state(self, LSAP_SETUP_PEND); - irlmp_do_lap_event(self->lap, LM_LAP_CONNECT_REQUEST, NULL); - /* Start watchdog timer (5 secs for now) */ irlmp_start_watchdog_timer(self, 5*HZ); + + irlmp_do_lap_event(self->lap, LM_LAP_CONNECT_REQUEST, NULL); break; case LM_CONNECT_INDICATION: if (self->conn_skb) { @@ -529,8 +529,6 @@ static int irlmp_state_disconnected(stru irlmp_next_lsap_state(self, LSAP_CONNECT_PEND); - irlmp_do_lap_event(self->lap, LM_LAP_CONNECT_REQUEST, NULL); - /* Start watchdog timer * This is not mentionned in the spec, but there is a rare * race condition that can get the socket stuck. @@ -543,10 +541,12 @@ static int irlmp_state_disconnected(stru * a backup plan. 1 second is plenty (should be immediate). * Jean II */ irlmp_start_watchdog_timer(self, 1*HZ); + + irlmp_do_lap_event(self->lap, LM_LAP_CONNECT_REQUEST, NULL); break; default: - IRDA_DEBUG(2, "%s(), Unknown event %s\n", - __FUNCTION__, irlmp_event[event]); + IRDA_DEBUG(1, "%s(), Unknown event %s on LSAP %#02x\n", + __FUNCTION__, irlmp_event[event], self->slsap_sel); if (skb) dev_kfree_skb(skb); break; @@ -604,8 +604,8 @@ static int irlmp_state_connect(struct ls irlmp_next_lsap_state(self, LSAP_DISCONNECTED); break; default: - IRDA_DEBUG(0, "%s(), Unknown event %s\n", - __FUNCTION__, irlmp_event[event]); + IRDA_DEBUG(0, "%s(), Unknown event %s on LSAP %#02x\n", + __FUNCTION__, irlmp_event[event], self->slsap_sel); if (skb) dev_kfree_skb(skb); break; @@ -666,8 +666,8 @@ static int irlmp_state_connect_pend(stru irlmp_next_lsap_state(self, LSAP_DISCONNECTED); break; default: - IRDA_DEBUG(0, "%s(), Unknown event %s\n", - __FUNCTION__, irlmp_event[event]); + IRDA_DEBUG(0, "%s(), Unknown event %s on LSAP %#02x\n", + __FUNCTION__, irlmp_event[event], self->slsap_sel); if (skb) dev_kfree_skb(skb); break; @@ -757,8 +757,8 @@ static int irlmp_state_dtr(struct lsap_c irlmp_disconnect_indication(self, reason, skb); break; default: - IRDA_DEBUG(0, "%s(), Unknown event %s\n", - __FUNCTION__, irlmp_event[event]); + IRDA_DEBUG(0, "%s(), Unknown event %s on LSAP %#02x\n", + __FUNCTION__, irlmp_event[event], self->slsap_sel); if (skb) dev_kfree_skb(skb); break; @@ -830,8 +830,8 @@ static int irlmp_state_setup(struct lsap irlmp_disconnect_indication(self, LM_CONNECT_FAILURE, NULL); break; default: - IRDA_DEBUG(0, "%s(), Unknown event %s\n", - __FUNCTION__, irlmp_event[event]); + IRDA_DEBUG(0, "%s(), Unknown event %s on LSAP %#02x\n", + __FUNCTION__, irlmp_event[event], self->slsap_sel); if (skb) dev_kfree_skb(skb); break; @@ -889,8 +889,8 @@ static int irlmp_state_setup_pend(struct irlmp_disconnect_indication(self, reason, NULL); break; default: - IRDA_DEBUG(0, "%s(), Unknown event %s\n", - __FUNCTION__, irlmp_event[event]); + IRDA_DEBUG(0, "%s(), Unknown event %s on LSAP %#02x\n", + __FUNCTION__, irlmp_event[event], self->slsap_sel); if (skb) dev_kfree_skb(skb); break;