From patchwork Tue May 27 19:11:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wenxiong X-Patchwork-Id: 353078 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 83F80140093 for ; Wed, 28 May 2014 05:15:54 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753422AbaE0TPv (ORCPT ); Tue, 27 May 2014 15:15:51 -0400 Received: from [32.97.110.57] ([32.97.110.57]:33188 "HELO jupiter1-lp2.austin.ibm.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with SMTP id S1753171AbaE0TPu (ORCPT ); Tue, 27 May 2014 15:15:50 -0400 Received: by jupiter1-lp2.austin.ibm.com (Postfix, from userid 0) id B3008121AF5; Tue, 27 May 2014 14:12:35 -0500 (CDT) Message-Id: <20140527191235.587455631@linux.vnet.ibm.com> References: <20140527191122.750711568@linux.vnet.ibm.com> User-Agent: quilt/0.46-1 Date: Tue, 27 May 2014 14:11:23 -0500 From: wenxiong@linux.vnet.ibm.com To: davem@davemloft.net Cc: ariel.elior@qlogic.com, netdev@vger.kernel.org, Wen Xiong Subject: [PATCH RESEND 1/2] bnx2x: Adapter not recovery from EEH error injection Content-Disposition: inline; filename=bnx2x_eeh_fix Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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;