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

Commit 4d64e718 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Jeff Garzik
Browse files

mv643xx_eth: mp->tx_desc_count needs spinlock protection 



mv643xx_eth_start_xmit() should check mp->tx_desc_count only
inside the mp->lock spinlock.

Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Reviewed-by: default avatarTzachi Perelstein <tzachi@marvell.com>
Signed-off-by: default avatarDale Farnsworth <dale@farnsworth.org>
parent dd9e0dda

drivers/net/mv643xx_eth.c

+10 −11
Original line number Diff line number Diff line
@@ -1741,23 +1741,22 @@ static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	BUG_ON(netif_queue_stopped(dev));

	BUG_ON(skb == NULL);



	if (mp->tx_ring_size - mp->tx_desc_count < MAX_DESCS_PER_SKB) {

		printk(KERN_ERR "%s: transmit with queue full\n", dev->name);

		netif_stop_queue(dev);

		return 1;

	}



	if (has_tiny_unaligned_frags(skb)) {

		if (__skb_linearize(skb)) {

	if (has_tiny_unaligned_frags(skb) && __skb_linearize(skb)) {

		stats->tx_dropped++;

		printk(KERN_DEBUG "%s: failed to linearize tiny "

				"unaligned fragment\n", dev->name);

		return 1;

	}

	}



	spin_lock_irqsave(&mp->lock, flags);



	if (mp->tx_ring_size - mp->tx_desc_count < MAX_DESCS_PER_SKB) {

		printk(KERN_ERR "%s: transmit with queue full\n", dev->name);

		netif_stop_queue(dev);

		spin_unlock_irqrestore(&mp->lock, flags);

		return 1;

	}



	eth_tx_submit_descs_for_skb(mp, skb);

	stats->tx_bytes += skb->len;

	stats->tx_packets++;