From: Eilon Greenstein Date: Mon, 2 Mar 2009 07:59:56 +0000 (+0000) Subject: bnx2x: Calling tx disable unconditionally X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=762d5f6c95e4c7036aaaf67ec0749ed64ebb71e7;p=deliverable%2Flinux.git 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 Signed-off-by: David S. Miller --- 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) { 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 */ } /*