---

yaml --- r: 178138 b: refs/heads/master c: e6bf95f h: refs/heads/master v: v3
git-mirror · Dec 19, 2009 · 968b560 · 968b560
1 parent 5d570e7
commit 968b560
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4773a47d8a564633cd80b94df397e91e946893e2
+refs/heads/master: e6bf95ffa8d6f8f4b7ee33ea01490d95b0bbeb6e
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
@@ -654,9 +654,17 @@ bnx2_netif_stop(struct bnx2 *bp)
 {
 	bnx2_cnic_stop(bp);
 	if (netif_running(bp->dev)) {
+		int i;
+
 		bnx2_napi_disable(bp);
 		netif_tx_disable(bp->dev);
-		bp->dev->trans_start = jiffies;	/* prevent tx timeout */
+		/* prevent tx timeout */
+		for (i = 0; i <  bp->dev->num_tx_queues; i++) {
+			struct netdev_queue *txq;
+
+			txq = netdev_get_tx_queue(bp->dev, i);
+			txq->trans_start = jiffies;
+		}
 	}
 }