Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[karo-tx-linux.git] / net / rds / iw_recv.c

diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c
index 45033358358e7ec5cb6a49448c4ba4965cf8d50c..aa8bf6786008afdb6de72221d4678628f93469a0 100644 (file)
--- a/net/rds/iw_recv.c
+++ b/net/rds/iw_recv.c
@@ -429,7 +429,7 @@ static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq,
 {
        atomic64_set(&ic->i_ack_next, seq);
        if (ack_required) {
-               smp_mb__before_clear_bit();
+               smp_mb__before_atomic();
                set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
        }
 }
@@ -437,7 +437,7 @@ static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq,
 static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
 {
        clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
-       smp_mb__after_clear_bit();
+       smp_mb__after_atomic();
 
        return atomic64_read(&ic->i_ack_next);
 }