From patchwork Wed Aug 26 12:01:09 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: frank.blaschka@de.ibm.com X-Patchwork-Id: 32136 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 262CEB70B3 for ; Wed, 26 Aug 2009 22:01:55 +1000 (EST) Received: by ozlabs.org (Postfix) id 17502DDD04; Wed, 26 Aug 2009 22:01:55 +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 87FF3DDD0B for ; Wed, 26 Aug 2009 22:01:54 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756961AbZHZMBr (ORCPT ); Wed, 26 Aug 2009 08:01:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756904AbZHZMBj (ORCPT ); Wed, 26 Aug 2009 08:01:39 -0400 Received: from mtagate7.de.ibm.com ([195.212.17.167]:44178 "EHLO mtagate7.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752903AbZHZMBi (ORCPT ); Wed, 26 Aug 2009 08:01:38 -0400 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate7.de.ibm.com (8.13.1/8.13.1) with ESMTP id n7QC1bDr025873; Wed, 26 Aug 2009 12:01:37 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id n7QC1b5b2130130; Wed, 26 Aug 2009 14:01:37 +0200 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n7QC1aRv032613; Wed, 26 Aug 2009 14:01:36 +0200 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n7QC1ad1032608; Wed, 26 Aug 2009 14:01:36 +0200 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 24631) id 7B5081224229; Wed, 26 Aug 2009 14:01:36 +0200 (CEST) Message-Id: <20090826120136.382656000@de.ibm.com> User-Agent: quilt/0.47-1 Date: Wed, 26 Aug 2009 14:01:09 +0200 From: frank.blaschka@de.ibm.com To: davem@davemloft.net Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org, Klaus-Dieter Wacker Subject: [patch 4/5] [PATCH] qeth: display service_level info only when valid. References: <20090826120105.727838000@de.ibm.com> Content-Disposition: inline; filename=610-qeth-service-level.diff Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Klaus-Dieter Wacker qeth displayed an entry in /proc/service_level even when no valid MCL-string was available (the MCL info is blank). The change is to create an entry in /proc/service_level only when MCL-string is non-zero. Signed-off-by: Klaus-Dieter Wacker --- drivers/s390/net/qeth_core_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: git_net-next/drivers/s390/net/qeth_core_main.c =================================================================== --- git_net-next.orig/drivers/s390/net/qeth_core_main.c +++ git_net-next/drivers/s390/net/qeth_core_main.c @@ -1160,8 +1160,9 @@ static void qeth_core_sl_print(struct se { struct qeth_card *card = container_of(slr, struct qeth_card, qeth_service_level); - seq_printf(m, "qeth: %s firmware level %s\n", CARD_BUS_ID(card), - card->info.mcl_level); + if (card->info.mcl_level[0]) + seq_printf(m, "qeth: %s firmware level %s\n", + CARD_BUS_ID(card), card->info.mcl_level); } static struct qeth_card *qeth_alloc_card(void)