diff options
| author |   Eilon Greenstein <eilong@broadcom.com> | 2009-01-22 03:37:36 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-01-22 13:45:05 -0800 |
| commit | e94d8af3da79f4bfbd22819d28ecf0602456f06f (patch) | |
| tree | c57ac22601ea49105bdbb3f8999404ae41d1ef04 /drivers/net/bnx2x_main.c | |
| parent | bnx2x: Reset HW before use (diff) | |
| download | linux-dev-e94d8af3da79f4bfbd22819d28ecf0602456f06f.tar.xz linux-dev-e94d8af3da79f4bfbd22819d28ecf0602456f06f.zip | |
bnx2x: Disable napi
Calling napi disabled unconditionally at netif stop
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x_main.c')
| -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) static void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw) { bnx2x_int_disable_sync(bp, disable_hw); + bnx2x_napi_disable(bp); if (netif_running(bp->dev)) { - bnx2x_napi_disable(bp); netif_tx_disable(bp->dev); bp->dev->trans_start = jiffies; /* prevent tx timeout */ } @@ -6689,8 +6689,7 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode) bnx2x_set_storm_rx_mode(bp); bnx2x_netif_stop(bp, 1); - if (!netif_running(bp->dev)) - bnx2x_napi_disable(bp); + del_timer_sync(&bp->timer); SHMEM_WR(bp, func_mb[BP_FUNC(bp)].drv_pulse_mb, (DRV_PULSE_ALWAYS_ALIVE | bp->fw_drv_pulse_wr_seq)); |