| commit | 90ac8f7741be4ff66de1f52904f4f67f272f74ce | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Tue Dec 13 08:53:56 2005 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Tue Dec 13 08:53:56 2005 -0800 |
| tree | d20316f5eb9fe399edd81c14d801602aac64a752 | |
| parent | 98684a9d91bceff829b6dc7adf0f662d59cfa6e3 [diff] | |
| parent | 50630195bbdfe1ca775d94cd68a5f18bc1b717e4 [diff] |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 8b6e2a1..00d6830 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c
@@ -2280,7 +2280,7 @@ } 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",