Commit 6c714f1b authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

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: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b263b0d7

net/mptcp/options.c

+1 −1
Original line number Diff line number Diff line
@@ -867,7 +867,7 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk, 
		clear_3rdack_retransmission(ssk);

		mptcp_pm_subflow_established(msk, subflow);

	} else {

		mptcp_pm_fully_established(msk);

		mptcp_pm_fully_established(msk, ssk, GFP_ATOMIC);

	}

	return true;

net/mptcp/pm.c

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ int mptcp_pm_remove_subflow(struct mptcp_sock *msk, u8 local_id) 


/* path manager event handlers */



void mptcp_pm_new_connection(struct mptcp_sock *msk, int server_side)

void mptcp_pm_new_connection(struct mptcp_sock *msk, const struct sock *ssk, int server_side)

{

	struct mptcp_pm_data *pm = &msk->pm;
@@ -119,7 +119,7 @@ static bool mptcp_pm_schedule_work(struct mptcp_sock *msk, 
	return true;

}



void mptcp_pm_fully_established(struct mptcp_sock *msk)

void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk, gfp_t gfp)

{

	struct mptcp_pm_data *pm = &msk->pm;

net/mptcp/protocol.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

net/mptcp/protocol.h

+2 −2
Original line number Diff line number Diff line
@@ -639,8 +639,8 @@ void mptcp_crypto_hmac_sha(u64 key1, u64 key2, u8 *msg, int len, void *hmac); 


void __init mptcp_pm_init(void);

void mptcp_pm_data_init(struct mptcp_sock *msk);

void mptcp_pm_new_connection(struct mptcp_sock *msk, int server_side);

void mptcp_pm_fully_established(struct mptcp_sock *msk);

void mptcp_pm_new_connection(struct mptcp_sock *msk, const struct sock *ssk, int server_side);

void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk, gfp_t gfp);

bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk);

void mptcp_pm_connection_closed(struct mptcp_sock *msk);

void mptcp_pm_subflow_established(struct mptcp_sock *msk,

net/mptcp/subflow.c

+1 −1
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk, 
			 * created mptcp socket

			 */

			new_msk->sk_destruct = mptcp_sock_destruct;

			mptcp_pm_new_connection(mptcp_sk(new_msk), 1);

			mptcp_pm_new_connection(mptcp_sk(new_msk), child, 1);

			mptcp_token_accept(subflow_req, mptcp_sk(new_msk));

			ctx->conn = new_msk;

			new_msk = NULL;