From 968b56012153c62b5237d8de19bb91bd45b7c241 Mon Sep 17 00:00:00 2001
From: Breno Leitao <leitao@linux.vnet.ibm.com>
Date: Fri, 18 Dec 2009 20:35:34 -0800
Subject: [PATCH] --- yaml --- r: 178138 b: refs/heads/master c:
 e6bf95ffa8d6f8f4b7ee33ea01490d95b0bbeb6e h: refs/heads/master v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/net/bnx2.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 685a5b722393..d49e6c94fff5 100644
--- 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
index c3e2b279fca0..f38764ec02c3 100644
--- 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;
+		}
 	}
 }