---

yaml --- r: 291579 b: refs/heads/master c: 5407b14 h: refs/heads/master i: 291577: 20dbfeb 291575: 2b28da1 v: v3
git-mirror · Mar 18, 2012 · db9eaa4 · db9eaa4
1 parent 5e49dc9
commit db9eaa4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1571df8f2d470a2b0cb3d48ffdffbc83c5924ef5
+refs/heads/master: 5407b14c6792d6ff122ecb1a2a6acffad60ef389
diff --git a/trunk/drivers/net/ethernet/freescale/gianfar.c b/trunk/drivers/net/ethernet/freescale/gianfar.c
@@ -2565,7 +2565,7 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
 	}
 
 	/* If we freed a buffer, we can restart transmission, if necessary */
-	if (__netif_subqueue_stopped(dev, tqi) && tx_queue->num_txbdfree)
+	if (netif_tx_queue_stopped(txq) && tx_queue->num_txbdfree)
 		netif_wake_subqueue(dev, tqi);
 
 	/* Update dirty indicators */