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

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

[PATCH] sky2: quiet ring full message in case of race 



Don't print ring full message if we lose race.

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 8cc048e3

drivers/net/sky2.c

+8 −3
Original line number Original line Diff line number Diff line
@@ -1081,11 +1081,16 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev) 
		return NETDEV_TX_LOCKED;

		return NETDEV_TX_LOCKED;





	if (unlikely(tx_avail(sky2) < tx_le_req(skb))) {

	if (unlikely(tx_avail(sky2) < tx_le_req(skb))) {

		/* There is a known but harmless race with lockless tx

		 * and netif_stop_queue.

		 */

		if (!netif_queue_stopped(dev)) {

			netif_stop_queue(dev);

			netif_stop_queue(dev);

		spin_unlock(&sky2->tx_lock);



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

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

			       dev->name);

			       dev->name);

		}

		spin_unlock(&sky2->tx_lock);



		return NETDEV_TX_BUSY;

		return NETDEV_TX_BUSY;

	}

	}