From 48274db2c15d388856528969e01bca2e78ff40e0 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 13 Dec 2005 08:53:56 -0800 Subject: [PATCH] --- yaml --- r: 15109 b: refs/heads/master c: 90ac8f7741be4ff66de1f52904f4f67f272f74ce h: refs/heads/master i: 15107: f70ff8a9663ce09ecfeeb4d2b72f7d650b82931a v: v3 --- [refs] | 2 +- trunk/drivers/net/skge.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2a7b19ded65b..35cbc9e11b98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50630195bbdfe1ca775d94cd68a5f18bc1b717e4 +refs/heads/master: 90ac8f7741be4ff66de1f52904f4f67f272f74ce diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c index 8b6e2a11e28d..00d683063c01 100644 --- a/trunk/drivers/net/skge.c +++ b/trunk/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",