diff options
| author | Arnaldo Carvalho de Melo <[email protected]> | 2022-08-01 08:59:31 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <[email protected]> | 2022-08-01 08:59:31 -0300 |
| commit | 18808564aa3bc9ae3309fd8a5c0a93f7f9a23f9a (patch) | |
| tree | 4c1732a2dddb246f0d39a492cbf8e6db31f3af3e /net/mptcp/subflow.c | |
| parent | 9a0b36266f7a83912592052035b84f13b12e30da (diff) | |
| parent | 3d7cb6b04c3f3115719235cc6866b10326de34cd (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up the fixes that went upstream via acme/perf/urgent and to get
to v5.19.
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
Diffstat (limited to 'net/mptcp/subflow.c')
| -rw-r--r-- | net/mptcp/subflow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 63e8892ec807..af28f3b60389 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1533,7 +1533,7 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc, mptcp_sock_graft(ssk, sk->sk_socket); iput(SOCK_INODE(sf)); WRITE_ONCE(msk->allow_infinite_fallback, false); - return err; + return 0; failed_unlink: list_del(&subflow->node); |