Merge branch '4.0.8-rt6'

[zynq/linux.git] / drivers / net / ethernet / freescale / gianfar.c

diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 7bf3682cdf478b1597cf04e071b525eed31adb69..d184495da53da08ce43a8b7fe692e07bfa3e08d7 100644 (file)
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -1522,7 +1522,7 @@ static int gfar_suspend(struct device *dev)
 
        if (netif_running(ndev)) {
 
-               local_irq_save(flags);
+               local_irq_save_nort(flags);
                lock_tx_qs(priv);
 
                gfar_halt_nodisable(priv);
@@ -1538,7 +1538,7 @@ static int gfar_suspend(struct device *dev)
                gfar_write(&regs->maccfg1, tempval);
 
                unlock_tx_qs(priv);
-               local_irq_restore(flags);
+               local_irq_restore_nort(flags);
 
                disable_napi(priv);
 
@@ -1580,7 +1580,7 @@ static int gfar_resume(struct device *dev)
        /* Disable Magic Packet mode, in case something
         * else woke us up.
         */
-       local_irq_save(flags);
+       local_irq_save_nort(flags);
        lock_tx_qs(priv);
 
        tempval = gfar_read(&regs->maccfg2);
@@ -1590,7 +1590,7 @@ static int gfar_resume(struct device *dev)
        gfar_start(priv);
 
        unlock_tx_qs(priv);
-       local_irq_restore(flags);
+       local_irq_restore_nort(flags);
 
        netif_device_attach(ndev);
 
@@ -3384,14 +3384,14 @@ static irqreturn_t gfar_error(int irq, void *grp_id)
                        dev->stats.tx_dropped++;
                        atomic64_inc(&priv->extra_stats.tx_underrun);
 
-                       local_irq_save(flags);
+                       local_irq_save_nort(flags);
                        lock_tx_qs(priv);
 
                        /* Reactivate the Tx Queues */
                        gfar_write(&regs->tstat, gfargrp->tstat);
 
                        unlock_tx_qs(priv);
-                       local_irq_restore(flags);
+                       local_irq_restore_nort(flags);
                }
                netif_dbg(priv, tx_err, dev, "Transmit Error\n");
        }