From patchwork Fri Sep 18 23:57:42 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tilman Schmidt X-Patchwork-Id: 33907 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 31B28B7B69 for ; Sat, 19 Sep 2009 09:59:18 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753203AbZIRX63 (ORCPT ); Fri, 18 Sep 2009 19:58:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752541AbZIRX6W (ORCPT ); Fri, 18 Sep 2009 19:58:22 -0400 Received: from gimli.pxnet.com ([195.227.45.7]:35033 "EHLO mail.pxnet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751317AbZIRX6Q (ORCPT ); Fri, 18 Sep 2009 19:58:16 -0400 Received: from xenon.ts.pxnet.com ([10.8.0.22]) (user=ts author=<> mech=DIGEST-MD5 bits=0) by mail.pxnet.com (8.13.8/8.13.8) with ESMTP id n8INvh3A002557; Sat, 19 Sep 2009 01:58:08 +0200 Received: by xenon.ts.pxnet.com (Postfix, from userid 1000) id EB0D611186C; Sat, 19 Sep 2009 01:57:42 +0200 (CEST) From: Tilman Schmidt Subject: [PATCH 2/4] isdn: accept CAPI Informational Info values as success To: Karsten Keil , Karsten Keil CC: davem@davemloft.net, i4ldeveloper@listserv.isdn4linux.de, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Message-ID: <20090919-patch-capi-2.tilman@imap.cc> In-Reply-To: <20090919-patch-capi-0.tilman@imap.cc> References: <20090919-patch-capi-0.tilman@imap.cc> Date: Sat, 19 Sep 2009 01:57:42 +0200 (CEST) X-Spam-Score: -2.212 () BAYES_00,RDNS_NONE X-Scanned-By: MIMEDefang 2.67 on 195.227.45.7 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Info values in the 0x00xx range are defined in the CAPI standard as "Informational, message processed successfully". Therefore a CONNECT_B3_CONF message with an Info value in that range should open an NCCI just as with Info==0. Signed-off-by: Tilman Schmidt --- drivers/isdn/capi/capi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c index 2d83524..65bf91e 100644 --- a/drivers/isdn/capi/capi.c +++ b/drivers/isdn/capi/capi.c @@ -603,7 +603,7 @@ static void capi_recv_message(struct capi20_appl *ap, struct sk_buff *skb) if (CAPIMSG_CMD(skb->data) == CAPI_CONNECT_B3_CONF) { u16 info = CAPIMSG_U16(skb->data, 12); // Info field - if (info == 0) { + if ((info & 0xff00) == 0) { mutex_lock(&cdev->ncci_list_mtx); capincci_alloc(cdev, CAPIMSG_NCCI(skb->data)); mutex_unlock(&cdev->ncci_list_mtx);