diff options
| author | Dust Li <dust.li@linux.alibaba.com> | 2022-03-01 17:43:59 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-13 20:03:24 +0200 |
| commit | 00183be98b9d3dfdca7f473084a2495ace8fc733 (patch) | |
| tree | 97d8ba7cd1f22acd69e77358bee2ee58ed30edad | |
| parent | 9ef86a43d51b527fcea324fe529a3f47fbfe738f (diff) | |
net/smc: send directly on setting TCP_NODELAY
commit b70a5cc045197aad9c159042621baf3c015f6cc7 upstream.
In commit ea785a1a573b("net/smc: Send directly when
TCP_CORK is cleared"), we don't use delayed work
to implement cork.
This patch use the same algorithm, removes the
delayed work when setting TCP_NODELAY and send
directly in setsockopt(). This also makes the
TCP_NODELAY the same as TCP.
Cc: Tony Lu <tonylu@linux.alibaba.com>
Signed-off-by: Dust Li <dust.li@linux.alibaba.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/smc/af_smc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index 0ec721b8059a..88bf88b7ed78 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -2621,8 +2621,8 @@ static int smc_setsockopt(struct socket *sock, int level, int optname, sk->sk_state != SMC_CLOSED) { if (val) { SMC_STAT_INC(smc, ndly_cnt); - mod_delayed_work(smc->conn.lgr->tx_wq, - &smc->conn.tx_work, 0); + smc_tx_pending(&smc->conn); + cancel_delayed_work(&smc->conn.tx_work); } } break; |