diff options
| author | David S. Miller <davem@davemloft.net> | 2021-10-28 13:04:29 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-28 13:04:29 +0100 |
| commit | a32f07d21102dd40496724e4416a7e97fc1755d8 (patch) | |
| tree | b34fee7aafcd17dd6d1cf1f144762866e0ad17ab | |
| parent | 90a881fc352a953f1c8beb61977a2db0818157d4 (diff) | |
| parent | f3a3a0fe0b644582fa5d83dd94b398f99fc57914 (diff) | |
| download | linux-a32f07d21102dd40496724e4416a7e97fc1755d8.tar.gz | |
Merge branch 'SMC-fixes'
Tony Lu says:
====================
Fixes for SMC
There are some fixes for SMC.
v1->v2:
- fix wrong email address.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/smc/af_smc.c | 2 | ||||
| -rw-r--r-- | net/smc/smc_llc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index c038efc23ce38..78b663dbfa1f9 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) & diff --git a/net/smc/smc_llc.c b/net/smc/smc_llc.c index 72f4b72eb1753..f1d323439a2af 100644 --- a/net/smc/smc_llc.c +++ b/net/smc/smc_llc.c @@ -1822,7 +1822,7 @@ void smc_llc_link_active(struct smc_link *link) link->smcibdev->ibdev->name, link->ibport); link->state = SMC_LNK_ACTIVE; if (link->lgr->llc_testlink_time) { - link->llc_testlink_time = link->lgr->llc_testlink_time * HZ; + link->llc_testlink_time = link->lgr->llc_testlink_time; schedule_delayed_work(&link->llc_testlink_wrk, link->llc_testlink_time); } |