From: Ursula Braun Date: Tue, 15 May 2018 15:04:54 +0000 (+0200) Subject: net/smc: no tx work trigger for fallback sockets X-Git-Tag: v4.18-rc1~114^2~237^2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=569bc643656826d5305aebdc5d5500c99881b2e5;p=thirdparty%2Fkernel%2Fstable.git net/smc: no tx work trigger for fallback sockets If TCP_NODELAY is set or TCP_CORK is reset, setsockopt triggers the tx worker. This does not make sense, if the SMC socket switched to the TCP fallback when the connection is created. This patch adds the additional check for the fallback case. Signed-off-by: Ursula Braun Signed-off-by: David S. Miller --- diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index 17688a02035b5..83403be46a4a9 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -1353,14 +1353,14 @@ static int smc_setsockopt(struct socket *sock, int level, int optname, break; case TCP_NODELAY: if (sk->sk_state != SMC_INIT && sk->sk_state != SMC_LISTEN) { - if (val) + if (val && !smc->use_fallback) mod_delayed_work(system_wq, &smc->conn.tx_work, 0); } break; case TCP_CORK: if (sk->sk_state != SMC_INIT && sk->sk_state != SMC_LISTEN) { - if (!val) + if (!val && !smc->use_fallback) mod_delayed_work(system_wq, &smc->conn.tx_work, 0); }