diff options
| author | Ursula Braun <ubraun@linux.ibm.com> | 2018-11-22 10:26:37 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-24 02:20:32 +0100 |
| commit | 9ed28556a388fdb894bdf9bd64c05cf6e7783ba3 (patch) | |
| tree | 1d26d17ba325140fa161657244f1e55b2f4c0c99 /net/smc/smc_clc.c | |
| parent | net/smc: remove sock_error detour in clc-functions (diff) | |
| download | linux-9ed28556a388fdb894bdf9bd64c05cf6e7783ba3.tar.xz linux-9ed28556a388fdb894bdf9bd64c05cf6e7783ba3.zip | |
net/smc: allow fallback after clc timeouts
If connection initialization fails for the LLC CONFIRM LINK or the
LLC ADD LINK step, fallback to TCP should be enabled. Thus
the negative return code -EAGAIN should switch to a positive timeout
reason code in these cases, and the internal CLC socket should
not have a set sk_err.
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc/smc_clc.c')
| -rw-r--r-- | net/smc/smc_clc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/smc/smc_clc.c b/net/smc/smc_clc.c index 7278ec0cfa58..62043d69e3a3 100644 --- a/net/smc/smc_clc.c +++ b/net/smc/smc_clc.c @@ -297,7 +297,11 @@ int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen, } if (clc_sk->sk_err) { reason_code = -clc_sk->sk_err; - smc->sk.sk_err = clc_sk->sk_err; + if (clc_sk->sk_err == EAGAIN && + expected_type == SMC_CLC_DECLINE) + clc_sk->sk_err = 0; /* reset for fallback usage */ + else + smc->sk.sk_err = clc_sk->sk_err; goto out; } if (!len) { /* peer has performed orderly shutdown */ @@ -306,7 +310,8 @@ int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen, goto out; } if (len < 0) { - smc->sk.sk_err = -len; + if (len != -EAGAIN || expected_type != SMC_CLC_DECLINE) + smc->sk.sk_err = -len; reason_code = len; goto out; } |