From patchwork Wed Apr 25 06:52:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karsten Keil X-Patchwork-Id: 154814 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 070B6B6EF1 for ; Wed, 25 Apr 2012 16:56:05 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751743Ab2DYGzx (ORCPT ); Wed, 25 Apr 2012 02:55:53 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:61759 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751280Ab2DYGzP (ORCPT ); Wed, 25 Apr 2012 02:55:15 -0400 Received: from mailone.linux-pingi.de (p54979DE3.dip.t-dialin.net [84.151.157.227]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0Lwqoy-1SBsP942jg-016axS; Wed, 25 Apr 2012 08:55:12 +0200 Received: from pingi6.linux-pingi.de (pingi6.linux-pingi.de [10.23.200.6]) by mailone.linux-pingi.de (Postfix) with ESMTP id D07F154F9; Wed, 25 Apr 2012 08:55:09 +0200 (CEST) Received: by pingi6.linux-pingi.de (Postfix, from userid 1000) id C1B2B9FBA8; Wed, 25 Apr 2012 08:52:14 +0200 (CEST) From: Karsten Keil To: David Miller Cc: netdev@vger.kernel.org, Andreas Eversberg Subject: [PATCH 2/4] mISDN: Using FLG_ACTIVE flag to determine if layer 1 is active or not. Date: Wed, 25 Apr 2012 08:52:12 +0200 Message-Id: <1335336734-25181-3-git-send-email-kkeil@linux-pingi.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1335336734-25181-1-git-send-email-kkeil@linux-pingi.de> References: <1335336734-25181-1-git-send-email-kkeil@linux-pingi.de> X-Provags-ID: V02:K0:9HAKzUlvZPtNbgHJx0S+1JKvxVo2vS+jEGlOPmddgrX xUyi/98CffCCo/3dDPxl1eBp8kvDDRXF+rSFbfIJ3E7P3My0qk BmCgPbss4/OZ1Q3uMnfTCQBb+DwyvL6kf/7BSaPy6K2RNwUjjd 4yDWsA/VWeuOVTOpMSsHN/Y8Xmyhyt0ZGhcH2eCCNGI3TkDcE3 nUzIyS54iIrTdGrujsoit2RExuDdGVFfdWHm2O16CP3SNq+AwX ToEh1R36/a9QyeNJ796pFh3v1k9+SYQWO0pvzjeS329j1kMOK+ S3M2cvhGjekxyzihk/sO5rq3EFGncM43jT4cW9H3dWuuEEC5OH Xbi61nL0BvQhV3uHMDQMpFTBv9nY61YVp6+b7DPwL0PKmzw3oU qkwB90eWdpANosNmL+XTjwGgtl81qDH1WY= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Andreas Eversberg We already have the flag for L1 active, so we should use it. L2 will be solved in a later patch. Signed-off-by: Andreas Eversberg Signed-off-by: Karsten Keil --- drivers/isdn/hardware/mISDN/hfcmulti.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c index c4e7fda..cc978e8 100644 --- a/drivers/isdn/hardware/mISDN/hfcmulti.c +++ b/drivers/isdn/hardware/mISDN/hfcmulti.c @@ -1619,10 +1619,16 @@ hfcmulti_leds(struct hfc_multi *hc) * 2 red steady: TE mode deactivate * left green: L1 active * left red: frame sync, but no L1 - * right green: L2 active + * todo right green: L2 active */ - if (hc->chan[hc->dslot].sync != 2) { /* no frame sync */ - if (hc->chan[hc->dslot].dch->dev.D.protocol + dch = hc->chan[hc->dslot].dch; + if (test_bit(FLG_ACTIVE, &dch->Flags)) { + led[0] = 0; + led[1] = 0; + led[2] = 0; + led[3] = 1; + } else { + if (dch->dev.D.protocol != ISDN_P_NT_E1) { led[0] = 1; led[1] = 1; @@ -1635,12 +1641,6 @@ hfcmulti_leds(struct hfc_multi *hc) } led[2] = 0; led[3] = 0; - } else { /* with frame sync */ - /* TODO make it work */ - led[0] = 0; - led[1] = 0; - led[2] = 0; - led[3] = 1; } leds = (led[0] | (led[1]<<2) | (led[2]<<1) | (led[3]<<3))^0xF; /* leds are inverted */ @@ -4062,14 +4062,9 @@ open_dchannel(struct hfc_multi *hc, struct dchannel *dch, hfcmulti_initmode(dch); spin_unlock_irqrestore(&hc->lock, flags); } - - if (((rq->protocol == ISDN_P_NT_S0) && (dch->state == 3)) || - ((rq->protocol == ISDN_P_TE_S0) && (dch->state == 7)) || - ((rq->protocol == ISDN_P_NT_E1) && (dch->state == 1)) || - ((rq->protocol == ISDN_P_TE_E1) && (dch->state == 1))) { + if (test_bit(FLG_ACTIVE, &dch->Flags)) _queue_data(&dch->dev.D, PH_ACTIVATE_IND, MISDN_ID_ANY, 0, NULL, GFP_KERNEL); - } rq->ch = &dch->dev.D; if (!try_module_get(THIS_MODULE)) printk(KERN_WARNING "%s:cannot get module\n", __func__);