summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-13 11:36:18 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-13 11:36:18 -0500
commitd22a8ccff761c81f2930bd90fa5712e51a0e9a62 (patch)
tree52a92cf1b9a65e4440276706c4b4e879d4008a87 /drivers/net
parent783e3385a134305d49d7b431df6e591265e7ec14 (diff)
parent98684a9d91bceff829b6dc7adf0f662d59cfa6e3 (diff)
downloadblackbird-op-linux-d22a8ccff761c81f2930bd90fa5712e51a0e9a62.tar.gz
blackbird-op-linux-d22a8ccff761c81f2930bd90fa5712e51a0e9a62.zip
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/skge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 8b6e2a11e28d..00d683063c01 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -2280,7 +2280,7 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
}
if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) {
- if (!netif_stopped(dev)) {
+ if (!netif_queue_stopped(dev)) {
netif_stop_queue(dev);
printk(KERN_WARNING PFX "%s: ring full when queue awake!\n",
OpenPOWER on IntegriCloud