aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/net/mptcp/subflow.c
diff options
context:
space:
mode:
authorPaolo Abeni <pabeni@redhat.com>2020-03-17 15:53:34 +0100
committerDavid S. Miller <davem@davemloft.net>2020-03-17 22:52:24 -0700
commit7f20d5fc708d30231bce074a099ac040b1b7d3e4 (patch)
tree5d7efe5ddecc6146f6370a3a706e4b2855b2807b /net/mptcp/subflow.c
parentMerge branch 'net-add-phylink-support-for-PCS' (diff)
downloadwireguard-linux-7f20d5fc708d30231bce074a099ac040b1b7d3e4.tar.xz
wireguard-linux-7f20d5fc708d30231bce074a099ac040b1b7d3e4.zip
mptcp: move msk state update to subflow_syn_recv_sock()
After commit 58b09919626b ("mptcp: create msk early"), the msk socket is already available at subflow_syn_recv_sock() time. Let's move there the state update, to mirror more closely the first subflow state. The above will also help multiple subflow supports. Signed-off-by: Paolo Abeni <pabeni@redhat.com> Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp/subflow.c')
-rw-r--r--net/mptcp/subflow.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 8434c7f5f712..052d72a1d3a2 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -234,6 +234,8 @@ create_child:
/* new mpc subflow takes ownership of the newly
* created mptcp socket
*/
+ inet_sk_state_store((struct sock *)new_msk,
+ TCP_ESTABLISHED);
ctx->conn = new_msk;
new_msk = NULL;
}