diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/bnx2x_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index ed8b34665931..860b9f8ddd30 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c | |||
@@ -6143,8 +6143,8 @@ static void bnx2x_netif_start(struct bnx2x *bp) | |||
6143 | static void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw) | 6143 | static void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw) |
6144 | { | 6144 | { |
6145 | bnx2x_int_disable_sync(bp, disable_hw); | 6145 | bnx2x_int_disable_sync(bp, disable_hw); |
6146 | bnx2x_napi_disable(bp); | ||
6146 | if (netif_running(bp->dev)) { | 6147 | if (netif_running(bp->dev)) { |
6147 | bnx2x_napi_disable(bp); | ||
6148 | netif_tx_disable(bp->dev); | 6148 | netif_tx_disable(bp->dev); |
6149 | bp->dev->trans_start = jiffies; /* prevent tx timeout */ | 6149 | bp->dev->trans_start = jiffies; /* prevent tx timeout */ |
6150 | } | 6150 | } |
@@ -6689,8 +6689,7 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode) | |||
6689 | bnx2x_set_storm_rx_mode(bp); | 6689 | bnx2x_set_storm_rx_mode(bp); |
6690 | 6690 | ||
6691 | bnx2x_netif_stop(bp, 1); | 6691 | bnx2x_netif_stop(bp, 1); |
6692 | if (!netif_running(bp->dev)) | 6692 | |
6693 | bnx2x_napi_disable(bp); | ||
6694 | del_timer_sync(&bp->timer); | 6693 | del_timer_sync(&bp->timer); |
6695 | SHMEM_WR(bp, func_mb[BP_FUNC(bp)].drv_pulse_mb, | 6694 | SHMEM_WR(bp, func_mb[BP_FUNC(bp)].drv_pulse_mb, |
6696 | (DRV_PULSE_ALWAYS_ALIVE | bp->fw_drv_pulse_wr_seq)); | 6695 | (DRV_PULSE_ALWAYS_ALIVE | bp->fw_drv_pulse_wr_seq)); |