Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / net / smc / smc_cdc.c

diff --git a/net/smc/smc_cdc.c b/net/smc/smc_cdc.c
index a7e8d63fc8aebe61c094c232d4b6f31439eed3e2..9bde1e4ca288cbf9db802fa3fd15650df4788867 100644 (file)
--- a/net/smc/smc_cdc.c
+++ b/net/smc/smc_cdc.c
@@ -233,7 +233,8 @@ static void smc_cdc_msg_recv_action(struct smc_sock *smc,
                        /* force immediate tx of current consumer cursor, but
                         * under send_lock to guarantee arrival in seqno-order
                         */
-                       smc_tx_sndbuf_nonempty(conn);
+                       if (smc->sk.sk_state != SMC_INIT)
+                               smc_tx_sndbuf_nonempty(conn);
                }
        }