From 92bfd46dcbf5a60c80292b6f017c272a7605505a Mon Sep 17 00:00:00 2001
From: Jon Mason <mason@myri.com>
Date: Mon, 27 Jun 2011 05:05:00 +0000
Subject: [PATCH] --- yaml --- r: 255983 b: refs/heads/master c:
 3b20b2dc5f713aa7eca20a8ff942292974a1cc94 h: refs/heads/master i:   255981:
 a1b7a00361bea7760b633009560ac31c660f3331   255979:
 2d2fa318bbb5265ccc52d7602ec42a8487d276dd   255975:
 4470f69ab424322c4dd36f603d057f0274f6dd41   255967:
 2858b46cc2fa29d999015fd2118fabab90c98d53 v: v3

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

diff --git a/[refs] b/[refs]
index 5bdbc00ff211..fd642c23a603 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81399ec683632b85863b093f4fffe2b4511e49e6
+refs/heads/master: 3b20b2dc5f713aa7eca20a8ff942292974a1cc94
diff --git a/trunk/drivers/net/myri10ge/myri10ge.c b/trunk/drivers/net/myri10ge/myri10ge.c
index 3ed5f3505cea..a8ae641d0bd1 100644
--- a/trunk/drivers/net/myri10ge/myri10ge.c
+++ b/trunk/drivers/net/myri10ge/myri10ge.c
@@ -1461,7 +1461,8 @@ myri10ge_tx_done(struct myri10ge_slice_state *ss, int mcp_index)
 
 	/* start the queue if we've stopped it */
 	if (netif_tx_queue_stopped(dev_queue) &&
-	    tx->req - tx->done < (tx->mask >> 1)) {
+	    tx->req - tx->done < (tx->mask >> 1) &&
+	    ss->mgp->running == MYRI10GE_ETH_RUNNING) {
 		tx->wake_queue++;
 		netif_tx_wake_queue(dev_queue);
 	}