diff options
| author | Florian Westphal <fw@strlen.de> | 2021-02-12 15:59:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-02-12 16:31:45 -0800 |
| commit | 6c714f1b547feb0402520357c91024375a4236f7 (patch) | |
| tree | 65ff35dc52d2b112b1bdaf4a388a0546e58f5973 /net/mptcp/protocol.c | |
| parent | b263b0d7d60baecda3c840a0703bb6d511f7ae2d (diff) | |
| download | lwn-6c714f1b547feb0402520357c91024375a4236f7.tar.gz lwn-6c714f1b547feb0402520357c91024375a4236f7.zip | |
mptcp: pass subflow socket to a few helpers
Pass the first/initial subflow to the existing functions so they can
pass this on to the notification handler that is added later in the
series.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp/protocol.c')
| -rw-r--r-- | net/mptcp/protocol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 1b8be2bf6b43..56240b87d464 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3028,7 +3028,7 @@ void mptcp_finish_connect(struct sock *ssk) WRITE_ONCE(msk->can_ack, 1); WRITE_ONCE(msk->snd_una, msk->write_seq); - mptcp_pm_new_connection(msk, 0); + mptcp_pm_new_connection(msk, ssk, 0); mptcp_rcv_space_init(msk, ssk); } @@ -3272,7 +3272,7 @@ static int mptcp_stream_accept(struct socket *sock, struct socket *newsock, list_add(&subflow->node, &msk->conn_list); sock_hold(msk->first); if (mptcp_is_fully_established(newsk)) - mptcp_pm_fully_established(msk); + mptcp_pm_fully_established(msk, msk->first, GFP_KERNEL); mptcp_copy_inaddrs(newsk, msk->first); mptcp_rcv_space_init(msk, msk->first); |