---

yaml --- r: 135019 b: refs/heads/master c: 762d5f6 h: refs/heads/master i: 135017: 4550696 135015: 7646728 v: v3
git-mirror · Mar 3, 2009 · f3c530d · f3c530d
1 parent f164c62
commit f3c530d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 490c3c9bf986545bdd99dcd4b0045c747564be39
+refs/heads/master: 762d5f6c95e4c7036aaaf67ec0749ed64ebb71e7
diff --git a/trunk/drivers/net/bnx2x_main.c b/trunk/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 */
 }
 
 /*