Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee1c8191 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

[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: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 0e670506

drivers/net/skge.c

+6 −4
Original line number Diff line number Diff line
@@ -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)) {

		if (!netif_stopped(dev)) {

			netif_stop_queue(dev);

		spin_unlock_irqrestore(&skge->tx_lock, flags);



			printk(KERN_WARNING PFX "%s: ring full when queue awake!\n",

			       dev->name);

		}

		spin_unlock_irqrestore(&skge->tx_lock, flags);

		return NETDEV_TX_BUSY;

	}