diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-14 04:20:12 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-14 04:20:12 +0100 |
| commit | c6329f4df2263ab5a40601a5236639e61b682f51 (patch) | |
| tree | 1ae9f8a5d65c8fcb87bf13c82ff09df641c3d418 /drivers | |
| parent | [PATCH] add boot option to control Intel SATA/PATA combined mode (diff) | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
| download | linux-c6329f4df2263ab5a40601a5236639e61b682f51.tar.xz linux-c6329f4df2263ab5a40601a5236639e61b682f51.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/skge.c | 2 |
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", |