tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+2
-2
+1
-1
net/smc/af_smc.c
+1
-1
net/smc/af_smc.c
···
1057
1057
if (smc->clcsock->sk->sk_err) {
1058
1058
smc->sk.sk_err = smc->clcsock->sk->sk_err;
1059
1059
} else if ((1 << smc->clcsock->sk->sk_state) &
1060
-
(TCPF_SYN_SENT | TCP_SYN_RECV)) {
1060
+
(TCPF_SYN_SENT | TCPF_SYN_RECV)) {
1061
1061
rc = sk_stream_wait_connect(smc->clcsock->sk, &timeo);
1062
1062
if ((rc == -EPIPE) &&
1063
1063
((1 << smc->clcsock->sk->sk_state) &
+1
-1
net/smc/smc_llc.c
+1
-1
net/smc/smc_llc.c
···
1822
1822
link->smcibdev->ibdev->name, link->ibport);
1823
1823
link->state = SMC_LNK_ACTIVE;
1824
1824
if (link->lgr->llc_testlink_time) {
1825
-
link->llc_testlink_time = link->lgr->llc_testlink_time * HZ;
1825
+
link->llc_testlink_time = link->lgr->llc_testlink_time;
1826
1826
schedule_delayed_work(&link->llc_testlink_wrk,
1827
1827
link->llc_testlink_time);
1828
1828
}