diff options
| author | Wang Sen <wangsen@linux.vnet.ibm.com> | 2014-05-23 11:36:23 +0800 |
|---|---|---|
| committer | cstl-robot <robot@ibm.com> | 2014-05-23 12:16:27 +0800 |
| commit | d7127f58839f17f5564deeda813c97d26e10bfed (patch) | |
| tree | 81de605eefb46c60ee6f9509e61dbbf9ac96fd4f | |
| parent | 653238008b2d74c1b850401640535ed93b439a5e (diff) | |
| download | powerkvm-d7127f58839f17f5564deeda813c97d26e10bfed.tar.gz | |
bnx2x: EEH recovory failed with Shiner adapter
This patch fixes the EEH recoery issue in bnx2x.
Signed-off-by: Wen Xiong <wenxiong@linux.vnet.ibm.com>
LTC-Bugzilla: #110449
| -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 ff5eb815435013..37de1bd2d021b9 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -12730,8 +12730,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; |