From patchwork Sat Mar 17 15:07:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karsten Keil X-Patchwork-Id: 154490 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 00C85B6F9A for ; Tue, 24 Apr 2012 03:08:38 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754515Ab2DWRI1 (ORCPT ); Mon, 23 Apr 2012 13:08:27 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:56985 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754158Ab2DWRIW (ORCPT ); Mon, 23 Apr 2012 13:08:22 -0400 Received: from mailone.linux-pingi.de (p5497CD69.dip.t-dialin.net [84.151.205.105]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0M2TGj-1S3JtW3eoX-00szVw; Mon, 23 Apr 2012 19:08:20 +0200 Received: from pingi6.linux-pingi.de (pingi6.linux-pingi.de [10.23.200.6]) by mailone.linux-pingi.de (Postfix) with ESMTP id 4082E4FDC; Mon, 23 Apr 2012 19:08:17 +0200 (CEST) Received: by pingi6.linux-pingi.de (Postfix, from userid 1000) id 79C269FBAA; Mon, 23 Apr 2012 19:05:50 +0200 (CEST) Date: Sat, 17 Mar 2012 16:07:55 +0100 Subject: [PATCH 14/28] mISDN: Layer1 statemachine fix From: Karsten Keil To: David Miller Cc: netdev@vger.kernel.org, isdn4linux@listserv.isdn4linux.de Message-Id: <20120423170550.79C269FBAA@pingi6.linux-pingi.de> X-Provags-ID: V02:K0:3/nuiUtuYgGNY8PBPyO9RcyQ23chJhA76kGY8DRjFJS /TqErlybKr7nh5BMoRF4a75bNx5BGD9BXNhj1jXJCnyt0/8Vup bzF+0vPRc60JTNGjUAQj2Y3+tFchntt0YZiOlYxLAMxBq9J8tw GBOcDLIzsg3KLg2d8zHj8KH8m2HOUiNGwdxKt9fxSESggVSVR5 Q+ubNKm0ZTsXSq9ceQw8Kq8n7KnS48c28eAJDeIYzJkhSTM1jv xUpVJeNvBvpvyydgj8PbAE3aEltEW6zUse/YOMqkcxBYMSkdGR 2uc7g8+ysPFZhKF+KJZ95bHpPNJTKm/S776qnrQoXtVe+XS4gX uU1I0BmfRDhKj9R56TiwVNWB0ucBc8leJJHFgtS8PwL1zg1VJb SfTdL9qQ+oU9VOKXyMFn/p3DbZDAFrGhpU= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The timer3 and the activation delay timer need to be independent. Now layer1 pass TBR3 again. Signed-off-by: Karsten Keil --- drivers/isdn/mISDN/layer1.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/isdn/mISDN/layer1.c b/drivers/isdn/mISDN/layer1.c index 65912bd..7feb78a 100644 --- a/drivers/isdn/mISDN/layer1.c +++ b/drivers/isdn/mISDN/layer1.c @@ -28,7 +28,8 @@ static u_int *debug; struct layer1 { u_long Flags; struct FsmInst l1m; - struct FsmTimer timer; + struct FsmTimer timer3; + struct FsmTimer timerX; int delay; int t3_value; struct dchannel *dch; @@ -135,7 +136,7 @@ l1_deact_req_s(struct FsmInst *fi, int event, void *arg) struct layer1 *l1 = fi->userdata; mISDN_FsmChangeState(fi, ST_L1_F3); - mISDN_FsmRestartTimer(&l1->timer, 550, EV_TIMER_DEACT, NULL, 2); + mISDN_FsmRestartTimer(&l1->timerX, 550, EV_TIMER_DEACT, NULL, 2); test_and_set_bit(FLG_L1_DEACTTIMER, &l1->Flags); } @@ -180,11 +181,11 @@ l1_info4_ind(struct FsmInst *fi, int event, void *arg) mISDN_FsmChangeState(fi, ST_L1_F7); l1->dcb(l1->dch, INFO3_P8); if (test_and_clear_bit(FLG_L1_DEACTTIMER, &l1->Flags)) - mISDN_FsmDelTimer(&l1->timer, 4); + mISDN_FsmDelTimer(&l1->timerX, 4); if (!test_bit(FLG_L1_ACTIVATED, &l1->Flags)) { if (test_and_clear_bit(FLG_L1_T3RUN, &l1->Flags)) - mISDN_FsmDelTimer(&l1->timer, 3); - mISDN_FsmRestartTimer(&l1->timer, 110, EV_TIMER_ACT, NULL, 2); + mISDN_FsmDelTimer(&l1->timer3, 3); + mISDN_FsmRestartTimer(&l1->timerX, 110, EV_TIMER_ACT, NULL, 2); test_and_set_bit(FLG_L1_ACTTIMER, &l1->Flags); } } @@ -201,8 +202,9 @@ l1_timer3(struct FsmInst *fi, int event, void *arg) l1->dcb(l1->dch, PH_DEACTIVATE_IND); } if (l1->l1m.state != ST_L1_F6) { + /* keep in F6 */ mISDN_FsmChangeState(fi, ST_L1_F3); - l1->dcb(l1->dch, HW_POWERUP_REQ); + /* do not force anything here, we need send INFO 0 */ } } @@ -234,8 +236,9 @@ l1_activate_s(struct FsmInst *fi, int event, void *arg) { struct layer1 *l1 = fi->userdata; - mISDN_FsmRestartTimer(&l1->timer, l1->t3_value, EV_TIMER3, NULL, 2); + mISDN_FsmRestartTimer(&l1->timer3, l1->t3_value, EV_TIMER3, NULL, 2); test_and_set_bit(FLG_L1_T3RUN, &l1->Flags); + /* Tell HW to send INFO 1 */ l1->dcb(l1->dch, HW_RESET_REQ); } @@ -303,7 +306,8 @@ static struct FsmNode L1SFnList[] = static void release_l1(struct layer1 *l1) { - mISDN_FsmDelTimer(&l1->timer, 0); + mISDN_FsmDelTimer(&l1->timerX, 0); + mISDN_FsmDelTimer(&l1->timer3, 0); if (l1->dch) l1->dch->l1 = NULL; module_put(THIS_MODULE); @@ -395,7 +399,8 @@ create_l1(struct dchannel *dch, dchannel_l1callback *dcb) { nl1->l1m.printdebug = l1m_debug; nl1->dch = dch; nl1->dcb = dcb; - mISDN_FsmInitTimer(&nl1->l1m, &nl1->timer); + mISDN_FsmInitTimer(&nl1->l1m, &nl1->timer3); + mISDN_FsmInitTimer(&nl1->l1m, &nl1->timerX); __module_get(THIS_MODULE); dch->l1 = nl1; return 0;