From: wenxiong@linux.vnet.ibm.com
To: davem@davemloft.net
Cc: ariel.elior@qlogic.com, netdev@vger.kernel.org,
Wen Xiong <wenxiong@linux.vnet.ibm.com>
Subject: [PATCH V2 1/2] bnx2x: Adapter not recovery from EEH error injection
Date: Wed, 28 May 2014 10:56:42 -0500 [thread overview]
Message-ID: <20140528155722.190598661@linux.vnet.ibm.com> (raw)
In-Reply-To: 20140528155641.920171803@linux.vnet.ibm.com
[-- Attachment #1: bnx2x_eeh_fix --]
[-- Type: text/plain, Size: 985 bytes --]
When injecting EEH error to bnx2x adapter, adapter couldn't be recovery
and caused recursive EEH errors. The patch fixes the issue.
Signed-off-by: Wen Xiong <wenxiong@linux.vnet.ibm.com>
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
===================================================================
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c 2014-05-22 18:42:48.000000000 -0500
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c 2014-05-22 18:44:36.757765539 -0500
@@ -13279,8 +13279,8 @@ static int bnx2x_eeh_nic_unload(struct b
netdev_reset_tc(bp->dev);
del_timer_sync(&bp->timer);
- cancel_delayed_work(&bp->sp_task);
- cancel_delayed_work(&bp->period_task);
+ cancel_delayed_work_sync(&bp->sp_task);
+ cancel_delayed_work_sync(&bp->period_task);
spin_lock_bh(&bp->stats_lock);
bp->stats_state = STATS_STATE_DISABLED;
--
next prev parent reply other threads:[~2014-05-28 16:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-28 15:56 [PATCH V2 0/2] Adapter not recovery from EEH error injection wenxiong
2014-05-28 15:56 ` wenxiong [this message]
2014-05-30 12:32 ` [PATCH V2 1/2] bnx2x: " Dmitry Kravkov
2014-05-28 15:56 ` [PATCH V2 2/2] bnx2x: Fix kernel crash and data miscompare after EEH recovery wenxiong
2014-05-28 19:23 ` Dmitry Kravkov
2014-05-29 14:50 ` wenxiong
2014-06-02 2:26 ` David Miller
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=20140528155722.190598661@linux.vnet.ibm.com \
--to=wenxiong@linux.vnet.ibm.com \
--cc=ariel.elior@qlogic.com \
--cc=davem@davemloft.net \
--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).