diff options
| author |   Jason Gunthorpe <jgg@nvidia.com> | 2021-11-01 14:49:20 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2021-11-01 14:49:20 -0300 |
| commit | a2a2a69d144d66e0c36697da062b3949e3c2c870 (patch) | |
| tree | 3849e66b693137506434a1a8f579963c626e33b6 /net/smc/af_smc.c | |
| parent | RDMA/irdma: optimize rx path by removing unnecessary copy (diff) | |
| parent | Linux 5.15 (diff) | |
| download | linux-dev-a2a2a69d144d66e0c36697da062b3949e3c2c870.tar.xz linux-dev-a2a2a69d144d66e0c36697da062b3949e3c2c870.zip | |
Merge tag 'v5.15' into rdma.git for-next
Pull in the accepted for-rc patches as the next merge needs a newer base.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'net/smc/af_smc.c')
| -rw-r--r-- | net/smc/af_smc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index c038efc23ce3..78b663dbfa1f 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -1057,7 +1057,7 @@ static void smc_connect_work(struct work_struct *work) if (smc->clcsock->sk->sk_err) { smc->sk.sk_err = smc->clcsock->sk->sk_err; } else if ((1 << smc->clcsock->sk->sk_state) & - (TCPF_SYN_SENT | TCP_SYN_RECV)) { + (TCPF_SYN_SENT | TCPF_SYN_RECV)) { rc = sk_stream_wait_connect(smc->clcsock->sk, &timeo); if ((rc == -EPIPE) && ((1 << smc->clcsock->sk->sk_state) & |