From patchwork Sun May 18 21:26:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tilman Schmidt X-Patchwork-Id: 350037 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 8233314008D for ; Mon, 19 May 2014 08:43:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752382AbaERWnS (ORCPT ); Sun, 18 May 2014 18:43:18 -0400 Received: from gimli.pxnet.com ([89.1.7.7]:43908 "EHLO mail.pxnet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752150AbaERWnR (ORCPT ); Sun, 18 May 2014 18:43:17 -0400 X-Greylist: delayed 2319 seconds by postgrey-1.27 at vger.kernel.org; Sun, 18 May 2014 18:43:14 EDT Received: from xenon.ts.pxnet.com (p5DE8D82F.dip0.t-ipconnect.de [93.232.216.47]) (user=ts author=<> mech=DIGEST-MD5 bits=0) by mail.pxnet.com (8.13.8/8.13.8) with ESMTP id s4IM3D6R019254 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 19 May 2014 00:03:15 +0200 Received: by xenon.ts.pxnet.com (Postfix, from userid 1000) id 7F80C140077; Mon, 19 May 2014 00:02:42 +0200 (CEST) To: netdev@vger.kernel.org CC: Paul Bolle , isdn4linux@listserv.isdn4linux.de, "Keil, Karsten" Message-Id: <9f26b3733e64ed9fafe1c0f7fcb5807223859d2f.1400448372.git.tilman@imap.cc> In-Reply-To: References: From: Tilman Schmidt Date: Sun, 18 May 2014 23:26:08 +0200 Subject: [PATCH 2/4] isdn/capi: Make verbose reporting depend on capidrv X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (mail.pxnet.com [89.1.7.7]); Mon, 19 May 2014 00:03:21 +0200 (CEST) X-Scanned-By: MIMEDefang 2.70 on 89.1.7.7 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Paul Bolle The Kconfig symbol ISDN_DRV_AVMB1_VERBOSE_REASON is only used for capi_info2str(). That function is only used in capidrv.c. So setting it without setting ISDN_CAPI_CAPIDRV is pointless. Make it depend on ISDN_CAPI_CAPIDRV, rename it to ISDN_CAPI_CAPIDRV_VERBOSE and put its entry after ISDN_CAPI_CAPIDRV's entry. Since this symbol seems to be primarily used for debugging, keep it off by default. By now the last users of capidrv hopefully know all they need to know about the reasons for disconnecting. Signed-off-by: Paul Bolle Signed-off-by: Tilman Schmidt --- drivers/isdn/capi/Kconfig | 16 ++++++++-------- drivers/isdn/capi/capidrv.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/isdn/capi/Kconfig b/drivers/isdn/capi/Kconfig index 9816c51..1d7adff 100644 --- a/drivers/isdn/capi/Kconfig +++ b/drivers/isdn/capi/Kconfig @@ -1,11 +1,3 @@ -config ISDN_DRV_AVMB1_VERBOSE_REASON - bool "Verbose reason code reporting" - default y - help - If you say Y here, the CAPI drivers will give verbose reasons for - disconnecting. This will increase the size of the kernel by 7 KB. If - unsure, say Y. - config CAPI_TRACE bool "CAPI trace support" default y @@ -42,3 +34,11 @@ config ISDN_CAPI_CAPIDRV the legacy isdn4linux link layer. If you have a card which is supported by a CAPI driver, but still want to use old features like ippp interfaces or ttyI emulation, say Y/M here. + +config ISDN_CAPI_CAPIDRV_VERBOSE + bool "Verbose reason code reporting" + depends on ISDN_CAPI_CAPIDRV + help + If you say Y here, the capidrv interface will give verbose reasons + for disconnecting. This will increase the size of the kernel by 7 KB. + If unsure, say N. diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c index 70e67f6..fd6d28f 100644 --- a/drivers/isdn/capi/capidrv.c +++ b/drivers/isdn/capi/capidrv.c @@ -765,7 +765,7 @@ static inline int new_bchan(capidrv_contr *card) /* ------------------------------------------------------------------- */ static char *capi_info2str(u16 reason) { -#ifndef CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON +#ifndef CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE return ".."; #else switch (reason) {