diff options
| author | Stefan Weil <weil@mail.berlios.de> | 2009-05-31 10:59:15 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-01 02:56:39 -0700 |
| commit | 0220ff7fc35913dcd8cdf8fb3a0966caf4aed2f3 (patch) | |
| tree | 2855ca8eada2d97ad19c58ecffd14a60f22210a9 | |
| parent | 69bd4ae5dc1ddb3c01e7668c7fd088904082a70c (diff) | |
| download | linux-3.10-0220ff7fc35913dcd8cdf8fb3a0966caf4aed2f3.tar.gz linux-3.10-0220ff7fc35913dcd8cdf8fb3a0966caf4aed2f3.tar.bz2 linux-3.10-0220ff7fc35913dcd8cdf8fb3a0966caf4aed2f3.zip | |
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>
| -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 08e2f67adfb..58afafbd3b9 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) 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); } } |