bnx2x: Calling tx disable unconditionally
authorEilon Greenstein <eilong@broadcom.com>
Mon, 2 Mar 2009 07:59:56 +0000 (07:59 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 3 Mar 2009 06:32:42 +0000 (22:32 -0800)
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>
drivers/net/bnx2x_main.c

index 3ef24b9..5397de1 100644 (file)
@@ -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 */
 }
 
 /*