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

Commit aa90f503 authored by Vitaly Bordug's avatar Vitaly Bordug Committed by David S. Miller
Browse files

FS_ENET: TX stuff should use fep->tx_lock, instead of fep->lock. 



Signed-off-by: default avatarVitaly Bordug <vitb@kernel.crashing.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 1a9e8549

drivers/net/fs_enet/fs_enet-main.c

+4 −2
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ static void fs_enet_tx(struct net_device *dev) 
	int dirtyidx, do_wake, do_restart;

	u16 sc;



	spin_lock(&fep->lock);

	spin_lock(&fep->tx_lock);

	bdp = fep->dirty_tx;



	do_wake = do_restart = 0;
@@ -415,7 +415,7 @@ static void fs_enet_tx(struct net_device *dev) 
	if (do_restart)

		(*fep->ops->tx_restart)(dev);



	spin_unlock(&fep->lock);

	spin_unlock(&fep->tx_lock);



	if (do_wake)

		netif_wake_queue(dev);
@@ -818,7 +818,9 @@ static int fs_enet_close(struct net_device *dev) 
	phy_stop(fep->phydev);



	spin_lock_irqsave(&fep->lock, flags);

	spin_lock(&fep->tx_lock);

	(*fep->ops->stop)(dev);

	spin_unlock(&fep->tx_lock);

	spin_unlock_irqrestore(&fep->lock, flags);



	/* release any irqs */