aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x_main.c
diff options
context:
space:
mode:
authorEilon Greenstein <eilong@broadcom.com>2009-03-02 02:59:56 -0500
committerDavid S. Miller <davem@davemloft.net>2009-03-03 01:32:42 -0500
commit762d5f6c95e4c7036aaaf67ec0749ed64ebb71e7 (patch)
tree46da14ec5663336e5956c4a3ea98f7524ea216ec /drivers/net/bnx2x_main.c
parent490c3c9bf986545bdd99dcd4b0045c747564be39 (diff)
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.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 3ef24b9eab3e..5397de1fc8d2 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)
6573{ 6573{
6574 bnx2x_int_disable_sync(bp, disable_hw); 6574 bnx2x_int_disable_sync(bp, disable_hw);
6575 bnx2x_napi_disable(bp); 6575 bnx2x_napi_disable(bp);
6576 if (netif_running(bp->dev)) { 6576 netif_tx_disable(bp->dev);
6577 netif_tx_disable(bp->dev); 6577 bp->dev->trans_start = jiffies; /* prevent tx timeout */
6578 bp->dev->trans_start = jiffies; /* prevent tx timeout */
6579 }
6580} 6578}
6581 6579
6582/* 6580/*