diff options
author | Stefan Weil <weil@mail.berlios.de> | 2009-05-31 06:59:15 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-01 05:56:39 -0400 |
commit | 0220ff7fc35913dcd8cdf8fb3a0966caf4aed2f3 (patch) | |
tree | 2855ca8eada2d97ad19c58ecffd14a60f22210a9 /drivers | |
parent | 69bd4ae5dc1ddb3c01e7668c7fd088904082a70c (diff) |
cpmac: prevent fatal exception in cpmac_end_xmit
We should not be stopping the subqueues in cpmac_end_xmit
but rather test the status of them. Replace the calls to
netif_subqueue_stop by __netif_subqueue_stopped. This
fixes an unrecoverable exception from happening when
running the driver.
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/cpmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c index 08e2f67adfb4..58afafbd3b9c 100644 --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c | |||
@@ -615,13 +615,13 @@ static void cpmac_end_xmit(struct net_device *dev, int queue) | |||
615 | 615 | ||
616 | dev_kfree_skb_irq(desc->skb); | 616 | dev_kfree_skb_irq(desc->skb); |
617 | desc->skb = NULL; | 617 | desc->skb = NULL; |
618 | if (netif_subqueue_stopped(dev, queue)) | 618 | if (__netif_subqueue_stopped(dev, queue)) |
619 | netif_wake_subqueue(dev, queue); | 619 | netif_wake_subqueue(dev, queue); |
620 | } else { | 620 | } else { |
621 | if (netif_msg_tx_err(priv) && net_ratelimit()) | 621 | if (netif_msg_tx_err(priv) && net_ratelimit()) |
622 | printk(KERN_WARNING | 622 | printk(KERN_WARNING |
623 | "%s: end_xmit: spurious interrupt\n", dev->name); | 623 | "%s: end_xmit: spurious interrupt\n", dev->name); |
624 | if (netif_subqueue_stopped(dev, queue)) | 624 | if (__netif_subqueue_stopped(dev, queue)) |
625 | netif_wake_subqueue(dev, queue); | 625 | netif_wake_subqueue(dev, queue); |
626 | } | 626 | } |
627 | } | 627 | } |