---

yaml --- r: 255983 b: refs/heads/master c: 3b20b2d h: refs/heads/master i: 255981: a1b7a00 255979: 2d2fa31 255975: 4470f69 255967: 2858b46 v: v3
git-mirror · Jun 29, 2011 · 92bfd46 · 92bfd46
1 parent a104a14
commit 92bfd46
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
 	}