From 6c1c564e75b68b26b3713e78c54fcc2ebaaf597d Mon Sep 17 00:00:00 2001 From: "G. Liakhovetski" Date: Fri, 8 Jun 2007 19:15:56 -0700 Subject: [PATCH] --- yaml --- r: 57709 b: refs/heads/master c: b7e773b869f49bbd69e9dad76b34d3552627fac5 h: refs/heads/master i: 57707: 3337ad22db2358adae1798b5dc64c6493849038c v: v3 --- [refs] | 2 +- trunk/net/irda/irlap_event.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 15272f3e557d..097f5fedf574 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0cfe7faa12f189ef1024fce5a710791d0062355 +refs/heads/master: b7e773b869f49bbd69e9dad76b34d3552627fac5 diff --git a/trunk/net/irda/irlap_event.c b/trunk/net/irda/irlap_event.c index 71c805506933..a8b8873aa263 100644 --- a/trunk/net/irda/irlap_event.c +++ b/trunk/net/irda/irlap_event.c @@ -1418,14 +1418,14 @@ static int irlap_state_nrm_p(struct irlap_cb *self, IRLAP_EVENT event, */ self->remote_busy = FALSE; + /* Stop final timer */ + del_timer(&self->final_timer); + /* * Nr as expected? */ ret = irlap_validate_nr_received(self, info->nr); if (ret == NR_EXPECTED) { - /* Stop final timer */ - del_timer(&self->final_timer); - /* Update Nr received */ irlap_update_nr_received(self, info->nr); @@ -1457,14 +1457,12 @@ static int irlap_state_nrm_p(struct irlap_cb *self, IRLAP_EVENT event, /* Resend rejected frames */ irlap_resend_rejected_frames(self, CMD_FRAME); - - /* Final timer ??? Jean II */ + irlap_start_final_timer(self, self->final_timeout * 2); irlap_next_state(self, LAP_NRM_P); } else if (ret == NR_INVALID) { IRDA_DEBUG(1, "%s(), Received RR with " "invalid nr !\n", __FUNCTION__); - del_timer(&self->final_timer); irlap_next_state(self, LAP_RESET_WAIT);