Merge tag 'sound-4.20-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[linux.git] / net / smc / smc_tx.h

diff --git a/net/smc/smc_tx.h b/net/smc/smc_tx.h
index 9d2238909fa08d72e63537607132dd3ac6a4e93f..07e6ad76224a0cd1b2fe5bb91d7acaa4eb977534 100644 (file)
--- a/net/smc/smc_tx.h
+++ b/net/smc/smc_tx.h
@@ -22,8 +22,8 @@ static inline int smc_tx_prepared_sends(struct smc_connection *conn)
 {
        union smc_host_cursor sent, prep;
 
-       smc_curs_write(&sent, smc_curs_read(&conn->tx_curs_sent, conn), conn);
-       smc_curs_write(&prep, smc_curs_read(&conn->tx_curs_prep, conn), conn);
+       smc_curs_copy(&sent, &conn->tx_curs_sent, conn);
+       smc_curs_copy(&prep, &conn->tx_curs_prep, conn);
        return smc_curs_diff(conn->sndbuf_desc->len, &sent, &prep);
 }
 
@@ -33,5 +33,7 @@ int smc_tx_sendmsg(struct smc_sock *smc, struct msghdr *msg, size_t len);
 int smc_tx_sndbuf_nonempty(struct smc_connection *conn);
 void smc_tx_sndbuf_nonfull(struct smc_sock *smc);
 void smc_tx_consumer_update(struct smc_connection *conn, bool force);
+int smcd_tx_ism_write(struct smc_connection *conn, void *data, size_t len,
+                     u32 offset, int signal);
 
 #endif /* SMC_TX_H */