diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 22:20:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 22:20:12 -0500 |
| commit | c6329f4df2263ab5a40601a5236639e61b682f51 (patch) | |
| tree | 1ae9f8a5d65c8fcb87bf13c82ff09df641c3d418 /drivers | |
| parent | 2bd0fa3b62e8565a80f9535e0f2bd51bba46213f (diff) | |
| parent | 65ab592dc5b34caebabfe1340e7c18f52a785079 (diff) | |
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) | |||
| 2280 | } | 2280 | } |
| 2281 | 2281 | ||
| 2282 | if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) { | 2282 | if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) { |
| 2283 | if (!netif_stopped(dev)) { | 2283 | if (!netif_queue_stopped(dev)) { |
| 2284 | netif_stop_queue(dev); | 2284 | netif_stop_queue(dev); |
| 2285 | 2285 | ||
| 2286 | printk(KERN_WARNING PFX "%s: ring full when queue awake!\n", | 2286 | printk(KERN_WARNING PFX "%s: ring full when queue awake!\n", |