]> asedeno.scripts.mit.edu Git - linux.git/blobdiff - net/smc/smc_cdc.h
Merge tag 'sound-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[linux.git] / net / smc / smc_cdc.h
index f1cdde9d4b890116862a4c9b8212546bfa2b7937..861dc24c588c65af9296e2973871693228cb0e8b 100644 (file)
@@ -270,17 +270,18 @@ static inline void smcr_cdc_msg_to_host(struct smc_host_cdc_msg *local,
 }
 
 static inline void smcd_cdc_msg_to_host(struct smc_host_cdc_msg *local,
-                                       struct smcd_cdc_msg *peer)
+                                       struct smcd_cdc_msg *peer,
+                                       struct smc_connection *conn)
 {
        union smc_host_cursor temp;
 
        temp.wrap = peer->prod.wrap;
        temp.count = peer->prod.count;
-       atomic64_set(&local->prod.acurs, atomic64_read(&temp.acurs));
+       smc_curs_copy(&local->prod, &temp, conn);
 
        temp.wrap = peer->cons.wrap;
        temp.count = peer->cons.count;
-       atomic64_set(&local->cons.acurs, atomic64_read(&temp.acurs));
+       smc_curs_copy(&local->cons, &temp, conn);
        local->prod_flags = peer->cons.prod_flags;
        local->conn_state_flags = peer->cons.conn_state_flags;
 }
@@ -290,7 +291,7 @@ static inline void smc_cdc_msg_to_host(struct smc_host_cdc_msg *local,
                                       struct smc_connection *conn)
 {
        if (conn->lgr->is_smcd)
-               smcd_cdc_msg_to_host(local, (struct smcd_cdc_msg *)peer);
+               smcd_cdc_msg_to_host(local, (struct smcd_cdc_msg *)peer, conn);
        else
                smcr_cdc_msg_to_host(local, peer, conn);
 }