Browse Source

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>
Stefan Weil 16 years ago
parent
commit
0220ff7fc3
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/net/cpmac.c

+ 2 - 2
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);
 		dev_kfree_skb_irq(desc->skb);
 		desc->skb = NULL;
 		desc->skb = NULL;
-		if (netif_subqueue_stopped(dev, queue))
+		if (__netif_subqueue_stopped(dev, queue))
 			netif_wake_subqueue(dev, queue);
 			netif_wake_subqueue(dev, queue);
 	} else {
 	} else {
 		if (netif_msg_tx_err(priv) && net_ratelimit())
 		if (netif_msg_tx_err(priv) && net_ratelimit())
 			printk(KERN_WARNING
 			printk(KERN_WARNING
 			       "%s: end_xmit: spurious interrupt\n", dev->name);
 			       "%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);
 			netif_wake_subqueue(dev, queue);
 	}
 	}
 }
 }