]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From e94d8af3da79f4bfbd22819d28ecf0602456f06f Mon Sep 17 00:00:00 2001 |
2 | From: Eilon Greenstein <eilong@broadcom.com> | |
3 | Date: Thu, 22 Jan 2009 03:37:36 +0000 | |
4 | Subject: bnx2x: Disable napi | |
5 | Acked-by: Karsten Keil <kkeil@novell.com> | |
6 | Reference: bnc#472500 | |
7 | ||
8 | Calling napi disabled unconditionally at netif stop | |
9 | ||
10 | Signed-off-by: Eilon Greenstein <eilong@broadcom.com> | |
11 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
12 | --- | |
13 | drivers/net/bnx2x_main.c | 5 ++--- | |
14 | 1 files changed, 2 insertions(+), 3 deletions(-) | |
15 | ||
16 | Index: linux-2.6.27-bnx2x_2/drivers/net/bnx2x_main.c | |
17 | =================================================================== | |
18 | --- linux-2.6.27-bnx2x_2.orig/drivers/net/bnx2x_main.c | |
19 | +++ linux-2.6.27-bnx2x_2/drivers/net/bnx2x_main.c | |
20 | @@ -6146,8 +6146,8 @@ static void bnx2x_netif_start(struct bnx | |
21 | static void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw) | |
22 | { | |
23 | bnx2x_int_disable_sync(bp, disable_hw); | |
24 | + bnx2x_napi_disable(bp); | |
25 | if (netif_running(bp->dev)) { | |
26 | - bnx2x_napi_disable(bp); | |
27 | netif_tx_disable(bp->dev); | |
28 | bp->dev->trans_start = jiffies; /* prevent tx timeout */ | |
29 | } | |
30 | @@ -6692,8 +6692,7 @@ static int bnx2x_nic_unload(struct bnx2x | |
31 | bnx2x_set_storm_rx_mode(bp); | |
32 | ||
33 | bnx2x_netif_stop(bp, 1); | |
34 | - if (!netif_running(bp->dev)) | |
35 | - bnx2x_napi_disable(bp); | |
36 | + | |
37 | del_timer_sync(&bp->timer); | |
38 | SHMEM_WR(bp, func_mb[BP_FUNC(bp)].drv_pulse_mb, | |
39 | (DRV_PULSE_ALWAYS_ALIVE | bp->fw_drv_pulse_wr_seq)); |