Commit 43f1140b authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

mptcp: export mptcp_subflow_active 



This patch moved the static function mptcp_subflow_active to protocol.h
as an inline one.

Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e4b61351

net/mptcp/protocol.c

+0 −12
Original line number Diff line number Diff line
@@ -399,18 +399,6 @@ static void mptcp_set_timeout(const struct sock *sk, const struct sock *ssk) 
	mptcp_sk(sk)->timer_ival = tout > 0 ? tout : TCP_RTO_MIN;

}



static bool mptcp_subflow_active(struct mptcp_subflow_context *subflow)

{

	struct sock *ssk = mptcp_subflow_tcp_sock(subflow);



	/* can't send if JOIN hasn't completed yet (i.e. is usable for mptcp) */

	if (subflow->request_join && !subflow->fully_established)

		return false;



	/* only send if our side has not closed yet */

	return ((1 << ssk->sk_state) & (TCPF_ESTABLISHED | TCPF_CLOSE_WAIT));

}



static bool tcp_can_send_ack(const struct sock *ssk)

{

	return !((1 << inet_sk_state_load(ssk)) &

net/mptcp/protocol.h

+12 −0
Original line number Diff line number Diff line
@@ -544,6 +544,18 @@ void mptcp_info2sockaddr(const struct mptcp_addr_info *info, 
			 struct sockaddr_storage *addr,

			 unsigned short family);



static inline bool mptcp_subflow_active(struct mptcp_subflow_context *subflow)

{

	struct sock *ssk = mptcp_subflow_tcp_sock(subflow);



	/* can't send if JOIN hasn't completed yet (i.e. is usable for mptcp) */

	if (subflow->request_join && !subflow->fully_established)

		return false;



	/* only send if our side has not closed yet */

	return ((1 << ssk->sk_state) & (TCPF_ESTABLISHED | TCPF_CLOSE_WAIT));

}



static inline void mptcp_subflow_tcp_fallback(struct sock *sk,

					      struct mptcp_subflow_context *ctx)

{