From patchwork Sun Sep 6 18:58:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tilman Schmidt X-Patchwork-Id: 33059 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 7FBC8B70B3 for ; Mon, 7 Sep 2009 05:04:13 +1000 (EST) Received: by ozlabs.org (Postfix) id 72FF0DDD0B; Mon, 7 Sep 2009 05:04:13 +1000 (EST) 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 14631DDD04 for ; Mon, 7 Sep 2009 05:04:13 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758379AbZIFTCh (ORCPT ); Sun, 6 Sep 2009 15:02:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758253AbZIFTCg (ORCPT ); Sun, 6 Sep 2009 15:02:36 -0400 Received: from gimli.pxnet.com ([195.227.45.7]:42879 "EHLO mail.pxnet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758199AbZIFS7b (ORCPT ); Sun, 6 Sep 2009 14:59:31 -0400 Received: from xenon.ts.pxnet.com ([10.8.0.10]) (user=ts author=<> mech=DIGEST-MD5 bits=0) by mail.pxnet.com (8.13.8/8.13.8) with ESMTP id n86IwrhU022703; Sun, 6 Sep 2009 20:58:56 +0200 Received: by xenon.ts.pxnet.com (Postfix, from userid 1000) id 820F1111869; Sun, 6 Sep 2009 20:58:52 +0200 (CEST) From: Tilman Schmidt Subject: [PATCH 2/4] isdn: accept CAPI Informational Info values as success To: davem@davemloft.net, Karsten Keil , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, i4ldeveloper@listserv.isdn4linux.de CC: Carsten Paeth Message-ID: <20090906-patch-capi-2.tilman@imap.cc> In-Reply-To: <20090906-patch-capi-0.tilman@imap.cc> References: <20090906-patch-capi-0.tilman@imap.cc> Date: Sun, 6 Sep 2009 20:58:52 +0200 (CEST) X-Spam-Score: -1.57 () AWL,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 Acked-by: Karsten Keil --- 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);