[PATCH 1/2] [FS_ENET] TX stuff should use fep->tx_lock, instead of fep->lock.

[Vitaly Bordug]

Signed-off-by: Vitaly Bordug <[EMAIL PROTECTED]>

---

 drivers/net/fs_enet/fs_enet-main.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/drivers/net/fs_enet/fs_enet-main.c 
b/drivers/net/fs_enet/fs_enet-main.c
index a4a2a0e..927cd9e 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -348,7 +348,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;
@@ -428,7 +428,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);
@@ -826,7 +826,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 */

_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev