bnx2x: Adapter not recovery from EEH error injection

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>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 3b0d431..6fa9cd4 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -13283,8 +13283,8 @@ static int bnx2x_eeh_nic_unload(struct bnx2x *bp)
        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;