From patchwork Thu Jun 23 17:52:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ron Mercer X-Patchwork-Id: 101662 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 9434EB6FA6 for ; Fri, 24 Jun 2011 04:11:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933412Ab1FWSLa (ORCPT ); Thu, 23 Jun 2011 14:11:30 -0400 Received: from va3ehsobe005.messaging.microsoft.com ([216.32.180.31]:30759 "EHLO VA3EHSOBE005.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933366Ab1FWSLW (ORCPT ); Thu, 23 Jun 2011 14:11:22 -0400 Received: from mail132-va3-R.bigfish.com (10.7.14.238) by VA3EHSOBE005.bigfish.com (10.7.40.25) with Microsoft SMTP Server id 14.1.225.22; Thu, 23 Jun 2011 18:11:22 +0000 Received: from mail132-va3 (localhost.localdomain [127.0.0.1]) by mail132-va3-R.bigfish.com (Postfix) with ESMTP id B646A1820298; Thu, 23 Jun 2011 18:11:21 +0000 (UTC) X-SpamScore: 0 X-BigFish: VPS0(zzzz1202hzz8275bhz2fh2a8h668h839h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: CIP:198.70.193.61; KIP:(null); UIP:(null); IPVD:NLI; H:avexcashub1.qlogic.com; RD:avexcashub1.qlogic.com; EFVD:NLI Received-SPF: pass (mail132-va3: domain of qlogic.com designates 198.70.193.61 as permitted sender) client-ip=198.70.193.61; envelope-from=ron.mercer@qlogic.com; helo=avexcashub1.qlogic.com ; 1.qlogic.com ; Received: from mail132-va3 (localhost.localdomain [127.0.0.1]) by mail132-va3 (MessageSwitch) id 1308852677136577_18524; Thu, 23 Jun 2011 18:11:17 +0000 (UTC) Received: from VA3EHSMHS013.bigfish.com (unknown [10.7.14.250]) by mail132-va3.bigfish.com (Postfix) with ESMTP id B2DC82C80EC; Thu, 23 Jun 2011 18:09:10 +0000 (UTC) Received: from avexcashub1.qlogic.com (198.70.193.61) by VA3EHSMHS013.bigfish.com (10.7.99.23) with Microsoft SMTP Server (TLS) id 14.1.225.22; Thu, 23 Jun 2011 18:09:00 +0000 Received: from linux-ox1b.qlogic.com (172.17.139.71) by avexcashub1.qlc.com (10.1.4.161) with Microsoft SMTP Server id 8.1.436.0; Thu, 23 Jun 2011 11:08:58 -0700 Received: by linux-ox1b.qlogic.com (Postfix, from userid 1000) id 9147A2C695; Thu, 23 Jun 2011 10:52:24 -0700 (PDT) From: Ron Mercer To: CC: , , , Subject: [net-2.6 PATCH 2/3] qlge:Fix printk priority so chip fatal errors are always reported. Date: Thu, 23 Jun 2011 10:52:23 -0700 Message-ID: <1308851544-25719-2-git-send-email-ron.mercer@qlogic.com> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1308851544-25719-1-git-send-email-ron.mercer@qlogic.com> References: <1308851544-25719-1-git-send-email-ron.mercer@qlogic.com> MIME-Version: 1.0 X-OriginatorOrg: qlogic.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jitendra Kalsaria Precedence of the printk should be at higher level so chip fatal errors are always reported. Signed-off-by: Jitendra Kalsaria Signed-off-by: Ron Mercer --- drivers/net/qlge/qlge_main.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 4fbefcf..66274ab 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c @@ -2170,7 +2170,7 @@ static void ql_process_chip_ae_intr(struct ql_adapter *qdev, return; case CAM_LOOKUP_ERR_EVENT: - netif_err(qdev, link, qdev->ndev, + netif_err(qdev, drv, qdev->ndev, "Multiple CAM hits lookup occurred.\n"); netif_err(qdev, drv, qdev->ndev, "This event shouldn't occur.\n"); @@ -2178,13 +2178,13 @@ static void ql_process_chip_ae_intr(struct ql_adapter *qdev, return; case SOFT_ECC_ERROR_EVENT: - netif_err(qdev, rx_err, qdev->ndev, + netif_err(qdev, drv, qdev->ndev, "Soft ECC error detected.\n"); ql_queue_asic_error(qdev); break; case PCI_ERR_ANON_BUF_RD: - netif_err(qdev, rx_err, qdev->ndev, + netif_err(qdev, drv, qdev->ndev, "PCI error occurred when reading anonymous buffers from rx_ring %d.\n", ib_ae_rsp->q_id); ql_queue_asic_error(qdev); @@ -2441,10 +2441,10 @@ static irqreturn_t qlge_isr(int irq, void *dev_id) */ if (var & STS_FE) { ql_queue_asic_error(qdev); - netif_err(qdev, intr, qdev->ndev, + netif_err(qdev, drv, qdev->ndev, "Got fatal error, STS = %x.\n", var); var = ql_read32(qdev, ERR_STS); - netif_err(qdev, intr, qdev->ndev, + netif_err(qdev, drv, qdev->ndev, "Resetting chip. Error Status Register = 0x%x\n", var); return IRQ_HANDLED; }