diff options
| author | wenxiong@linux.vnet.ibm.com | 2014-06-03 21:14:45 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-06-04 03:37:38 +0200 |
| commit | 0c0e63410a393aae4b615849625f539db775d586 (patch) | |
| tree | a75453791e7888f6b5cc3965067bdce327ad9b16 /drivers/net/ethernet/broadcom | |
| parent | net: driver: smsc: set NOCARRIER flag in dev at driver initialization (diff) | |
| download | kernel-qcow2-linux-0c0e63410a393aae4b615849625f539db775d586.tar.gz kernel-qcow2-linux-0c0e63410a393aae4b615849625f539db775d586.tar.xz kernel-qcow2-linux-0c0e63410a393aae4b615849625f539db775d586.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 3b0d43154e67..6fa9cd475888 100644 --- 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; |