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>
This commit is contained in:
commit
a32f07d211
@ -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) &
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user