From mboxrd@z Thu Jan 1 00:00:00 1970 From: wenxiong@linux.vnet.ibm.com Subject: [PATCH 1/2] bnx2x: Adapter not recovery from EEH error injection Date: Fri, 23 May 2014 11:29:56 -0500 Message-ID: <20140523163025.817545098@linux.vnet.ibm.com> References: <20140523162955.780765614@linux.vnet.ibm.com> Cc: Wen Xiong To: netdev@vger.kernel.org Return-path: Received: from [32.97.110.57] ([32.97.110.57]:33168 "HELO jupiter1-lp2.austin.ibm.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with SMTP id S1753475AbaEWQkW (ORCPT ); Fri, 23 May 2014 12:40:22 -0400 Content-Disposition: inline; filename=bnx2x_eeh_fix Sender: netdev-owner@vger.kernel.org List-ID: 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; --