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

[linux.git] / net / smc / smc_cdc.c

diff --git a/net/smc/smc_cdc.c b/net/smc/smc_cdc.c
index fb07ad8d69a62a7789c6651b50fb939c8ccf8d83..d0b0f4c865b4082454d9085642f9b730ee3ef375 100644 (file)
--- a/net/smc/smc_cdc.c
+++ b/net/smc/smc_cdc.c
@@ -103,8 +103,10 @@ int smc_cdc_msg_send(struct smc_connection *conn,
        conn->local_tx_ctrl.seqno = conn->tx_cdc_seq;
        smc_host_msg_to_cdc((struct smc_cdc_msg *)wr_buf, conn, &cfed);
        rc = smc_wr_tx_send(link, (struct smc_wr_tx_pend_priv *)pend);
-       if (!rc)
+       if (!rc) {
                smc_curs_copy(&conn->rx_curs_confirmed, &cfed, conn);
+               conn->local_rx_ctrl.prod_flags.cons_curs_upd_req = 0;
+       }
 
        return rc;
 }
@@ -192,6 +194,7 @@ int smcd_cdc_msg_send(struct smc_connection *conn)
        if (rc)
                return rc;
        smc_curs_copy(&conn->rx_curs_confirmed, &curs, conn);
+       conn->local_rx_ctrl.prod_flags.cons_curs_upd_req = 0;
        /* Calculate transmitted data and increment free send buffer space */
        diff = smc_curs_diff(conn->sndbuf_desc->len, &conn->tx_curs_fin,
                             &conn->tx_curs_sent);
@@ -268,26 +271,18 @@ static void smc_cdc_msg_recv_action(struct smc_sock *smc,
                smp_mb__after_atomic();
                smc->sk.sk_data_ready(&smc->sk);
        } else {
-               if (conn->local_rx_ctrl.prod_flags.write_blocked ||
-                   conn->local_rx_ctrl.prod_flags.cons_curs_upd_req ||
-                   conn->local_rx_ctrl.prod_flags.urg_data_pending) {
-                       if (conn->local_rx_ctrl.prod_flags.urg_data_pending)
-                               conn->urg_state = SMC_URG_NOTYET;
-                       /* force immediate tx of current consumer cursor, but
-                        * under send_lock to guarantee arrival in seqno-order
-                        */
-                       if (smc->sk.sk_state != SMC_INIT)
-                               smc_tx_sndbuf_nonempty(conn);
-               }
+               if (conn->local_rx_ctrl.prod_flags.write_blocked)
+                       smc->sk.sk_data_ready(&smc->sk);
+               if (conn->local_rx_ctrl.prod_flags.urg_data_pending)
+                       conn->urg_state = SMC_URG_NOTYET;
        }
 
-       /* piggy backed tx info */
        /* trigger sndbuf consumer: RDMA write into peer RMBE and CDC */
-       if (diff_cons && smc_tx_prepared_sends(conn)) {
+       if ((diff_cons && smc_tx_prepared_sends(conn)) ||
+           conn->local_rx_ctrl.prod_flags.cons_curs_upd_req ||
+           conn->local_rx_ctrl.prod_flags.urg_data_pending)
                smc_tx_sndbuf_nonempty(conn);
-               /* trigger socket release if connection closed */
-               smc_close_wake_tx_prepared(smc);
-       }
+
        if (diff_cons && conn->urg_tx_pend &&
            atomic_read(&conn->peer_rmbe_space) == conn->peer_rmbe_size) {
                /* urg data confirmed by peer, indicate we're ready for more */