diff options
| author | Eilon Greenstein <eilong@broadcom.com> | 2009-03-02 07:59:56 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-02 22:32:42 -0800 |
| commit | 762d5f6c95e4c7036aaaf67ec0749ed64ebb71e7 (patch) | |
| tree | 46da14ec5663336e5956c4a3ea98f7524ea216ec /drivers/net/bnx2x_main.c | |
| parent | 490c3c9bf986545bdd99dcd4b0045c747564be39 (diff) | |
| download | op-kernel-dev-762d5f6c95e4c7036aaaf67ec0749ed64ebb71e7.zip op-kernel-dev-762d5f6c95e4c7036aaaf67ec0749ed64ebb71e7.tar.gz | |
bnx2x: Calling tx disable unconditionally
On unload, the FW assumes that no packets will be sent after the driver sends
the FW stop command. To ensure that, the driver must always call
netif_tx_disable
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 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index 3ef24b9..5397de1 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c @@ -6573,10 +6573,8 @@ 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)) { - netif_tx_disable(bp->dev); - bp->dev->trans_start = jiffies; /* prevent tx timeout */ - } + netif_tx_disable(bp->dev); + bp->dev->trans_start = jiffies; /* prevent tx timeout */ } /* |
