From: Stephen Hemminger <shemminger@osdl.org>
Date: Tue, 6 Dec 2005 23:01:49 +0000 (-0800)
Subject: [PATCH] skge: get rid of warning on race
X-Git-Tag: v2.6.15-rc6~94^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ee1c81917a0c10f44c1b400482b8372e68238ff8;p=~emulex%2Finfiniband.git

[PATCH] skge: get rid of warning on race

Get rid of warning in case of race with ring full and lockless
tx on the skge driver. It is possible to be in the transmit
routine with no available slots and already stopped.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---

diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 716467879b9..8b6e2a11e28 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;
 	}