diff options
| author |  Jakub Kicinski <kuba@kernel.org>
| 2022-07-28 18:21:16 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org>
| 2022-07-28 18:21:16 -0700 |
| commit | 272ac32f566e3f925b20c231a2b30f6893aa258a (patch) | |
| tree | c7c04a13d89349f0d007914904347df79438f3fa /net/mptcp/subflow.c | |
| parent | net: cdns,macb: use correct xlnx prefix for Xilinx (diff) | |
| parent | Merge tag 'net-5.19-final' of git://git.kernel.org/pub/scm/linux/kernel/git/n... (diff) | |
| download | linux-272ac32f566e3f925b20c231a2b30f6893aa258a.tar.gz linux-272ac32f566e3f925b20c231a2b30f6893aa258a.tar.bz2 linux-272ac32f566e3f925b20c231a2b30f6893aa258a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
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 d4b16d033978..901c763dcdbb 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); |