summaryrefslogtreecommitdiffstats
path: root/drivers/net/skge.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-13 01:43:33 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-13 01:43:33 -0500
commitd00d598ffbba974d9045ba8b95296655fe2162c5 (patch)
tree93bdc3bf4ec728d554c54e3f1f51cb5597f53a31 /drivers/net/skge.c
parentb5632303401c231bf270ef36f1013e52caf4caf9 (diff)
parentbe0d9b6c7aeaad1683059c00131cabd4c894c17c (diff)
downloadtalos-obmc-linux-d00d598ffbba974d9045ba8b95296655fe2162c5.tar.gz
talos-obmc-linux-d00d598ffbba974d9045ba8b95296655fe2162c5.zip
Merge branch 'master'
Diffstat (limited to 'drivers/net/skge.c')
-rw-r--r--drivers/net/skge.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 716467879b9c..8b6e2a11e28d 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -2280,11 +2280,13 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
}
if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) {
- netif_stop_queue(dev);
- spin_unlock_irqrestore(&skge->tx_lock, flags);
+ if (!netif_stopped(dev)) {
+ netif_stop_queue(dev);
- printk(KERN_WARNING PFX "%s: ring full when queue awake!\n",
- dev->name);
+ printk(KERN_WARNING PFX "%s: ring full when queue awake!\n",
+ dev->name);
+ }
+ spin_unlock_irqrestore(&skge->tx_lock, flags);
return NETDEV_TX_BUSY;
}
OpenPOWER on IntegriCloud