diff options
| author | Len Brown <len.brown@intel.com> | 2005-12-14 02:59:50 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-12-14 02:59:50 -0500 |
| commit | d3e4cefc86ce1aefc0e9aebdc56308cb4bd51997 (patch) | |
| tree | f4418610996064cab63600ca093de65356dcdfde /drivers/net/skge.c | |
| parent | 927fe18397b3b1194a5b26b1d388d97e391e5fd2 (diff) | |
| parent | acd9b7b4e08a3f0f48afa922d8e371414cf2d3b2 (diff) | |
Auto-update from upstream
Diffstat (limited to 'drivers/net/skge.c')
| -rw-r--r-- | drivers/net/skge.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 716467879b9..00d683063c0 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_queue_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; } |