From: Ron Mercer <ron.mercer@qlogic.com>
To: <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, <ron.mercer@qlogic.com>,
<jitendra.kalsaria@qlogic.com>, <ameen.rahman@qlogic.com>
Subject: [net-2.6 PATCH 2/3] qlge: Fix printk priority so chip fatal errors are always reported.
Date: Thu, 30 Jun 2011 13:02:06 -0700 [thread overview]
Message-ID: <1309464127-14797-2-git-send-email-ron.mercer@qlogic.com> (raw)
In-Reply-To: <1308855049.6688.19.camel@Joe-Laptop>
From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Precedence of the printk should be at higher level so chip fatal
errors are always reported.
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
---
drivers/net/qlge/qlge_main.c | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 4fbefcf..6b4ff97 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -2170,23 +2170,20 @@ static void ql_process_chip_ae_intr(struct ql_adapter *qdev,
return;
case CAM_LOOKUP_ERR_EVENT:
- netif_err(qdev, link, qdev->ndev,
- "Multiple CAM hits lookup occurred.\n");
- netif_err(qdev, drv, qdev->ndev,
- "This event shouldn't occur.\n");
+ netdev_err(qdev->ndev, "Multiple CAM hits lookup occurred.\n");
+ netdev_err(qdev->ndev, "This event shouldn't occur.\n");
ql_queue_asic_error(qdev);
return;
case SOFT_ECC_ERROR_EVENT:
- netif_err(qdev, rx_err, qdev->ndev,
- "Soft ECC error detected.\n");
+ netdev_err(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,
- "PCI error occurred when reading anonymous buffers from rx_ring %d.\n",
- ib_ae_rsp->q_id);
+ netdev_err(qdev->ndev, "PCI error occurred when reading "
+ "anonymous buffers from rx_ring %d.\n",
+ ib_ae_rsp->q_id);
ql_queue_asic_error(qdev);
break;
@@ -2441,11 +2438,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,
- "Got fatal error, STS = %x.\n", var);
+ netdev_err(qdev->ndev, "Got fatal error, STS = %x.\n", var);
var = ql_read32(qdev, ERR_STS);
- netif_err(qdev, intr, qdev->ndev,
- "Resetting chip. Error Status Register = 0x%x\n", var);
+ netdev_err(qdev->ndev, "Resetting chip. "
+ "Error Status Register = 0x%x\n", var);
return IRQ_HANDLED;
}
--
1.6.0.2
next prev parent reply other threads:[~2011-06-30 20:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-23 17:52 [net-2.6 PATCH 1/3] qlge:Fix crash caused by mailbox execution on wedged chip Ron Mercer
2011-06-23 17:52 ` [net-2.6 PATCH 2/3] qlge:Fix printk priority so chip fatal errors are always reported Ron Mercer
2011-06-23 18:50 ` Joe Perches
2011-06-23 18:43 ` Ron Mercer
2011-06-30 20:02 ` [net-2.6 PATCH 1/3] qlge:Fix crash caused by mailbox execution on wedged chip Ron Mercer
2011-07-02 0:36 ` David Miller
2011-06-30 20:02 ` Ron Mercer [this message]
2011-07-02 0:36 ` [net-2.6 PATCH 2/3] qlge: Fix printk priority so chip fatal errors are always reported David Miller
2011-06-30 20:02 ` [net-2.6 PATCH 3/3] qlge:Version change to v1.00.00.29 Ron Mercer
2011-07-02 0:36 ` David Miller
2011-06-23 17:52 ` Ron Mercer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1309464127-14797-2-git-send-email-ron.mercer@qlogic.com \
--to=ron.mercer@qlogic.com \
--cc=ameen.rahman@qlogic.com \
--cc=davem@davemloft.net \
--cc=jitendra.kalsaria@qlogic.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).