---

yaml --- r: 150583 b: refs/heads/master c: 0220ff7 h: refs/heads/master i: 150581: fa8a4a2 150579: f10f6fe 150575: cad933e v: v3
git-mirror · Jun 1, 2009 · 062c5ad · 062c5ad
1 parent 5e7e725
commit 062c5ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69bd4ae5dc1ddb3c01e7668c7fd088904082a70c
+refs/heads/master: 0220ff7fc35913dcd8cdf8fb3a0966caf4aed2f3
diff --git a/trunk/drivers/net/cpmac.c b/trunk/drivers/net/cpmac.c
@@ -615,13 +615,13 @@ static void cpmac_end_xmit(struct net_device *dev, int queue)
 
 		dev_kfree_skb_irq(desc->skb);
 		desc->skb = NULL;
-		if (netif_subqueue_stopped(dev, queue))
+		if (__netif_subqueue_stopped(dev, queue))
 			netif_wake_subqueue(dev, queue);
 	} else {
 		if (netif_msg_tx_err(priv) && net_ratelimit())
 			printk(KERN_WARNING
 			       "%s: end_xmit: spurious interrupt\n", dev->name);
-		if (netif_subqueue_stopped(dev, queue))
+		if (__netif_subqueue_stopped(dev, queue))
 			netif_wake_subqueue(dev, queue);
 	}
 }