[MPTCP] [PATCH 1/2] protocol: pm callback must be done after msk state is set up

[MPTCP] [PATCH 1/2] protocol: pm callback must be done after msk state is set up

[Florian Westphal]

[-- Attachment #1: Type: text/plain, Size: 1054 bytes --]

Squashto: mptcp: Add path manager interface

current location calls this when msk->token is still 0, so pm worker
will never find the mptcp socket it should be using.

Signed-off-by: Florian Westphal <fw(a)strlen.de>
---
 net/mptcp/protocol.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 475ef4c90460..a33c4c58de78 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1371,8 +1371,6 @@ void mptcp_finish_connect(struct sock *ssk)
 
 	pr_debug("msk=%p, token=%u", sk, subflow->token);
 
-	mptcp_pm_new_connection(msk, 0);
-
 	mptcp_crypto_key_sha(subflow->remote_key, NULL, &ack_seq);
 	ack_seq++;
 	subflow->map_seq = ack_seq;
@@ -1389,6 +1387,8 @@ void mptcp_finish_connect(struct sock *ssk)
 	WRITE_ONCE(msk->ack_seq, ack_seq);
 	WRITE_ONCE(msk->can_ack, 1);
 	atomic64_set(&msk->snd_una, msk->write_seq);
+
+	mptcp_pm_new_connection(msk, 0);
 }
 
 static void mptcp_sock_graft(struct sock *sk, struct socket *parent)
-- 
2.24.1