Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-block.git] / drivers / net / ethernet / freescale / gianfar.c

diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 16f46f1224bafcc3a34bb25cf28efb68c6f4f28c..a6cf40e62f3a9c531f2997c34590fbe89d0ddc80 100644 (file)
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -1806,9 +1806,9 @@ void stop_gfar(struct net_device *dev)
 
        netif_tx_stop_all_queues(dev);
 
-       smp_mb__before_clear_bit();
+       smp_mb__before_atomic();
        set_bit(GFAR_DOWN, &priv->state);
-       smp_mb__after_clear_bit();
+       smp_mb__after_atomic();
 
        disable_napi(priv);
 
@@ -2051,9 +2051,9 @@ int startup_gfar(struct net_device *ndev)
 
        gfar_init_tx_rx_base(priv);
 
-       smp_mb__before_clear_bit();
+       smp_mb__before_atomic();
        clear_bit(GFAR_DOWN, &priv->state);
-       smp_mb__after_clear_bit();
+       smp_mb__after_atomic();
 
        /* Start Rx/Tx DMA and enable the interrupts */
        gfar_start(priv);