From 062c5adc331423d30ce4a68597a70afb239b04bf Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 31 May 2009 10:59:15 +0000 Subject: [PATCH] --- yaml --- r: 150583 b: refs/heads/master c: 0220ff7fc35913dcd8cdf8fb3a0966caf4aed2f3 h: refs/heads/master i: 150581: fa8a4a2ed128410d9568622659c52beb01906673 150579: f10f6fe39b1290f91ced31427c120f7052da8736 150575: cad933e2797385d098ca44e262fb517fa9942303 v: v3 --- [refs] | 2 +- trunk/drivers/net/cpmac.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 325861eb5638..07e73d4ed522 100644 --- 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 index 08e2f67adfb4..58afafbd3b9c 100644 --- 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); } }