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

[karo-tx-linux.git] / drivers / net / ethernet / broadcom / bnx2x / bnx2x_cmn.c

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 23da47925fa3799a23e72832e152ce33488c38d7..47c5814114e1764145f18c9c2088e8395214602e 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -2793,7 +2793,7 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
 
        case LOAD_OPEN:
                netif_tx_start_all_queues(bp->dev);
-               smp_mb__after_clear_bit();
+               smp_mb__after_atomic();
                break;
 
        case LOAD_DIAG:
@@ -4951,9 +4951,9 @@ void bnx2x_update_coalesce_sb_index(struct bnx2x *bp, u8 fw_sb_id,
 void bnx2x_schedule_sp_rtnl(struct bnx2x *bp, enum sp_rtnl_flag flag,
                            u32 verbose)
 {
-       smp_mb__before_clear_bit();
+       smp_mb__before_atomic();
        set_bit(flag, &bp->sp_rtnl_state);
-       smp_mb__after_clear_bit();
+       smp_mb__after_atomic();
        DP((BNX2X_MSG_SP | verbose), "Scheduling sp_rtnl task [Flag: %d]\n",
           flag);
        schedule_delayed_work(&bp->sp_rtnl_task, 0);